back out part of 346954 to fix Flash when migrating a profile from PPC to x86. b=356694 r=sayrer sr=jst

modules/plugin/base/src/nsPluginHostImpl.cpp

@@ -4882,6 +4882,7 @@ nsresult nsPluginHostImpl::ScanPluginsDirectory(nsIFile * pluginsDir,
     if (NS_FAILED(rv))
       continue;
 
+    if (nsPluginsDir::IsPluginFile(dirEntry)) {
       pluginFileinDirectory * item = new pluginFileinDirectory();
       if (!item)
         return NS_ERROR_OUT_OF_MEMORY;
@@ -4893,7 +4894,7 @@ nsresult nsPluginHostImpl::ScanPluginsDirectory(nsIFile * pluginsDir,
       item->mModTime = fileModTime;
       item->mFilename = filePath;
       pluginFilesArray.AppendElement(item);
-   
+    }
   } // end round of up of plugin files
 
   // now sort the array by file modification time or by filename, if equal
@@ -4942,15 +4943,9 @@ nsresult nsPluginHostImpl::ScanPluginsDirectory(nsIFile * pluginsDir,
       }
     }
     else {
-      if (nsPluginsDir::IsPluginFile(localfile)) {
       // plugin file was added, flag this fact
       *aPluginsChanged = PR_TRUE;
     }
-      else {
-        // It's a non-plugin, so keep looping.
-        continue;
-      }
-    }
 
     // if we are not creating the list, just continue the loop
     // no need to proceed if changes are detected