Fix regression from my previous plugin change where internal plugins didn't get loaded correctly.

Review URL: http://codereview.chromium.org/19676

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8912 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 8 insertions, 11 deletions

diff --git a/webkit/glue/plugins/plugin_list.cc b/webkit/glue/plugins/plugin_list.cc
index fb9ae10..9befa8f 100644
--- a/webkit/glue/plugins/plugin_list.cc
+++ b/webkit/glue/plugins/plugin_list.cc
@@ -122,14 +122,7 @@ bool PluginList::CreateWebPluginInfo(const PluginVersionInfo& pvi,
 }
 
 PluginList::PluginList() : plugins_loaded_(false) {
-}
-
-void PluginList::LoadPlugins(bool refresh) {
-  if (plugins_loaded_ && !refresh)
-    return;
-
-  if (!plugins_loaded_) {
-    PlatformInit();
+  PlatformInit();
 
 #if defined(OS_WIN)
   const PluginVersionInfo default_plugin = {
@@ -145,9 +138,13 @@ void PluginList::LoadPlugins(bool refresh) {
     default_plugin::NP_Shutdown
   };
 
-  RegisterInternalPlugin(default_plugin);
+  internal_plugins_.push_back(default_plugin);
 #endif
-  }
+}
+
+void PluginList::LoadPlugins(bool refresh) {
+  if (plugins_loaded_ && !refresh)
+    return;
 
   plugins_.clear();
   plugins_loaded_ = true;
diff --git a/webkit/glue/plugins/plugin_list_win.cc b/webkit/glue/plugins/plugin_list_win.cc
index 55d21dc..37db580 100644
--- a/webkit/glue/plugins/plugin_list_win.cc
+++ b/webkit/glue/plugins/plugin_list_win.cc
@@ -252,7 +252,7 @@ void PluginList::PlatformInit() {
   };
 
   for (int i = 0; i < arraysize(builtin_plugins); ++i)
-    RegisterInternalPlugin(builtin_plugins[i]);
+    internal_plugins_.push_back(builtin_plugins[i]);
 }
 
 void PluginList::GetPluginDirectories(std::vector<FilePath>* plugin_dirs) {