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,18 +4882,19 @@ nsresult nsPluginHostImpl::ScanPluginsDirectory(nsIFile * pluginsDir,
     if (NS_FAILED(rv))
       continue;
 
-    pluginFileinDirectory * item = new pluginFileinDirectory();
+    if (nsPluginsDir::IsPluginFile(dirEntry)) {
-    if (!item)
+      pluginFileinDirectory * item = new pluginFileinDirectory();
-      return NS_ERROR_OUT_OF_MEMORY;
+      if (!item)
-    
+        return NS_ERROR_OUT_OF_MEMORY;
-    // Get file mod time
+
-    PRInt64 fileModTime = LL_ZERO;
+      // Get file mod time
-    dirEntry->GetLastModifiedTime(&fileModTime);
+      PRInt64 fileModTime = LL_ZERO;
-    
+      dirEntry->GetLastModifiedTime(&fileModTime);
-    item->mModTime = fileModTime;
+
-    item->mFilename = filePath;
+      item->mModTime = fileModTime;
-    pluginFilesArray.AppendElement(item);
+      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,14 +4943,8 @@ nsresult nsPluginHostImpl::ScanPluginsDirectory(nsIFile * pluginsDir,
       }
     }
     else {
-      if (nsPluginsDir::IsPluginFile(localfile)) {
+      // plugin file was added, flag this fact
-        // plugin file was added, flag this fact
+      *aPluginsChanged = PR_TRUE;
-        *aPluginsChanged = PR_TRUE;
-      }
-      else {
-        // It's a non-plugin, so keep looping.
-        continue;
-      }
     }
 
     // if we are not creating the list, just continue the loop