Ensure we don't load plugins on the IO thread

chrome/common/chrome_plugin_lib.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 "chrome/common/chrome_plugin_lib.h"
 
 #include "base/command_line.h"
 #include "base/hash_tables.h"
 #include "base/histogram.h"
 #include "base/message_loop.h"
@@ skipping 24 matching lines @@
     PluginMap;
 
 // A map of all the instantiated plugins.
 static PluginMap* g_loaded_libs;
 
 // The thread plugins are loaded and used in, lazily initialized upon
 // the first creation call.
 static PlatformThreadId g_plugin_thread_id = 0;
 static MessageLoop* g_plugin_thread_loop = NULL;
 
-#ifdef GEARS_STATIC_LIB
-// defined in gears/base/chrome/module_cr.cc
-CPError STDCALL Gears_CP_Initialize(CPID id, const CPBrowserFuncs *bfuncs,
-                                    CPPluginFuncs *pfuncs);
-#endif
-
 static bool IsSingleProcessMode() {
   // We don't support ChromePlugins in single-process mode.
   return CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess);
 }
 
 // static
 bool ChromePluginLib::IsInitialized() {
   return (g_loaded_libs != NULL);
 }
 
@@ skipping 52 matching lines @@
 
 // static
 void ChromePluginLib::RegisterPluginsWithNPAPI() {
   // We don't support ChromePlugins in single-process mode.
   if (IsSingleProcessMode())
     return;
 
   FilePath path;
   if (!PathService::Get(chrome::FILE_GEARS_PLUGIN, &path))
     return;
-  // Note: we can only access the NPAPI list because the PluginService has done
-  // the locking for us.  We should not touch it anywhere else.
-  NPAPI::PluginList::AddExtraPluginPath(path);
+  NPAPI::PluginList::Singleton()->AddExtraPluginPath(path);
 }
 
 static void LogPluginLoadTime(const TimeDelta &time) {
   UMA_HISTOGRAM_TIMES("Gears.LoadTime", time);
 }
 
 // static
 void ChromePluginLib::LoadChromePlugins(const CPBrowserFuncs* bfuncs) {
   static bool loaded = false;
   if (loaded)
@@ skipping 110 matching lines @@
     return -1;
   return CP_Test_(param);
 }
 
 bool ChromePluginLib::Load() {
 #if !defined(OS_WIN)
   // Mac and Linux won't implement Gears.
   return false;
 #else
   DCHECK(module_ == 0);
-#ifdef GEARS_STATIC_LIB
-  FilePath path;
-  if (filename_.BaseName().value().find(FILE_PATH_LITERAL("gears")) == 0) {
-    CP_Initialize_ = &Gears_CP_Initialize;
-    return true;
-  }
-#endif
 
   module_ = LoadLibrary(filename_.value().c_str());
   if (module_ == 0)
     return false;
 
   // required initialization function
   CP_Initialize_ = reinterpret_cast<CP_InitializeFunc>
       (GetProcAddress(module_, "CP_Initialize"));
 
   if (!CP_Initialize_) {
@@ skipping 23 matching lines @@
   if (initialized_)
     CP_Shutdown();
 
 #if defined(OS_WIN)
   if (module_) {
     FreeLibrary(module_);
     module_ = 0;
   }
 #endif
 }