Fix the regression where Gears didn't load.

webkit/glue/plugins/plugin_list.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <algorithm>
 #include <tchar.h>
 
 #include "webkit/glue/plugins/plugin_list.h"
 
 #include "base/command_line.h"
@@ skipping 76 matching lines @@
 
   plugins_.clear();
   plugins_loaded_ = true;
 
   TimeTicks start_time = TimeTicks::Now();
 
   LoadInternalPlugins();
 
   std::set<FilePath> directories_to_scan;
 
-
-  // Load any plugins listed in the registry
-  if (extra_plugin_paths_) {
-    for (size_t i = 0; i < extra_plugin_paths_->size(); ++i)
-      directories_to_scan.insert((*extra_plugin_paths_)[i].DirName());
-  }
-
   // Load from the application-specific area
   GetAppDirectory(&directories_to_scan);
 
   // Load from the executable area
   GetExeDirectory(&directories_to_scan);
 
   // Load Java
   GetJavaDirectory(&directories_to_scan);
 
   // Load firefox plugins too.  This is mainly to try to locate 
   // a pre-installed Flash player.
   GetFirefoxDirectory(&directories_to_scan);
 
   // Firefox hard-codes the paths of some popular plugins to ensure that
   // the plugins are found.  We are going to copy this as well.
   GetAcrobatDirectory(&directories_to_scan);
   GetQuicktimeDirectory(&directories_to_scan);
   GetWindowsMediaDirectory(&directories_to_scan);
 
   for (std::set<FilePath>::const_iterator iter = directories_to_scan.begin();
        iter != directories_to_scan.end(); ++iter) {
     LoadPluginsFromDir(*iter);
   }
 
+  if (extra_plugin_paths_) {
+    for (size_t i = 0; i < extra_plugin_paths_->size(); ++i)
+      LoadPlugin((*extra_plugin_paths_)[i]);
+  }
+
   if (webkit_glue::IsDefaultPluginEnabled()) {
     WebPluginInfo info;
     if (PluginLib::ReadWebPluginInfo(FilePath(kDefaultPluginLibraryName),
                                      &info)) {
       plugins_.push_back(info);
     }
   }
 
   TimeTicks end_time = TimeTicks::Now();
   TimeDelta elapsed = end_time - start_time;
@@ skipping 389 matching lines @@
     RegKey key(root_key, reg_path.c_str());
 
     std::wstring path;
     if (key.ReadValue(kRegistryPath, &path))
       plugin_dirs->insert(FilePath(path).DirName());
   }
 }
 
 } // namespace NPAPI