Fix registration of internal plugins broken by rev 23501...

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 "webkit/glue/plugins/plugin_list.h"
 
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/time.h"
@@ skipping 123 matching lines @@
 
   internal_plugins_.push_back(default_plugin);
 #endif
 }
 
 void PluginList::LoadPlugins(bool refresh) {
   // Don't want to hold the lock while loading new plugins, so we don't block
   // other methods if they're called on other threads.
   std::vector<FilePath> extra_plugin_paths;
   std::vector<FilePath> extra_plugin_dirs;
+  std::vector<PluginVersionInfo> internal_plugins;
   {
     AutoLock lock(lock_);
     if (plugins_loaded_ && !refresh)
       return;
 
     extra_plugin_paths = extra_plugin_paths_;
     extra_plugin_dirs = extra_plugin_dirs_;
+    internal_plugins = internal_plugins_;
   }
 
   base::TimeTicks start_time = base::TimeTicks::Now();
 
   std::vector<WebPluginInfo> new_plugins;
 
   std::vector<FilePath> directories_to_scan;
   GetPluginDirectories(&directories_to_scan);
 
+  // Load internal plugins first so that, if both an internal plugin and a
+  // "discovered" plugin want to handle the same type, the internal plugin
+  // will have precedence.
+  for (size_t i = 0; i < internal_plugins.size(); ++i) {
+    if (internal_plugins[i].path.value() == kDefaultPluginLibraryName)
+      continue;
+    LoadPlugin(internal_plugins[i].path, &new_plugins);
+  }
+
   for (size_t i = 0; i < extra_plugin_paths.size(); ++i)
     LoadPlugin(extra_plugin_paths[i], &new_plugins);
 
   for (size_t i = 0; i < extra_plugin_dirs.size(); ++i) {
     LoadPluginsFromDir(extra_plugin_dirs[i], &new_plugins);
   }
 
   for (size_t i = 0; i < directories_to_scan.size(); ++i) {
     LoadPluginsFromDir(directories_to_scan[i], &new_plugins);
   }
 
+  // Load the default plugin last.
   if (webkit_glue::IsDefaultPluginEnabled())
     LoadPlugin(FilePath(kDefaultPluginLibraryName), &new_plugins);
 
   base::TimeTicks end_time = base::TimeTicks::Now();
   base::TimeDelta elapsed = end_time - start_time;
   DLOG(INFO) << "Loaded plugin list in " << elapsed.InMilliseconds() << " ms.";
 
   AutoLock lock(lock_);
   plugins_ = new_plugins;
   plugins_loaded_ = true;
@@ skipping 140 matching lines @@
   }
 
   return false;
 }
 
 void PluginList::Shutdown() {
   // TODO
 }
 
 } // namespace NPAPI