Preparing rollback in case things don't work out....

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"
 #include "net/base/mime_util.h"
 #include "webkit/default_plugin/plugin_main.h"
 #include "webkit/glue/plugins/plugin_constants_win.h"
 #include "webkit/glue/plugins/plugin_lib.h"
 #include "webkit/glue/webkit_glue.h"
 #include "googleurl/src/gurl.h"
 
-#define kNpGoogleNaClPlugin (FILE_PATH_LITERAL("npgooglenaclplugin"))
-
 namespace NPAPI {
 
 base::LazyInstance<PluginList> g_singleton(base::LINKER_INITIALIZED);
 
 // static
 PluginList* PluginList::Singleton() {
   return g_singleton.Pointer();
 }
 
 bool PluginList::PluginsLoaded() {
@@ skipping 78 matching lines @@
         mime_type.description.erase(ext);
       }
     }
 
     info->mime_types.push_back(mime_type);
   }
 
   return true;
 }
 
-PluginList::PluginList() : plugins_loaded_(false),
-                           use_internal_nacl_(false) {
+PluginList::PluginList() : plugins_loaded_(false) {
   PlatformInit();
 
 #if defined(OS_WIN)
   const PluginVersionInfo default_plugin = {
     FilePath(kDefaultPluginLibraryName),
     L"Default Plug-in",
     L"Provides functionality for installing third-party plug-ins",
     L"1",
     L"*",
     L"",
@@ skipping 34 matching lines @@
     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);
   }
 
-  if (use_internal_nacl_) {
-    LoadPlugin(FilePath(kNaClPluginLibraryName), &new_plugins);
-  }
-
   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 21 matching lines @@
       // to handle mimeTypes on its own.
       const std::string &mime_type = plugin_info.mime_types[i].mime_type;
       if (mime_type == "*" )
         return;
     }
   }
 
   plugins->push_back(plugin_info);
 }
 
-bool PluginList::ShouldLoadPlugin(const WebPluginInfo& info,
-                                  std::vector<WebPluginInfo>* plugins) {
-  FilePath::StringType filename =
-      StringToLowerASCII(info.path.BaseName().value());
-
-  // Don't load the external version of NaCl when we need to use
-  // the internal one.
-  if (use_internal_nacl_) {
-    if (std::wstring::npos != filename.find(kNpGoogleNaClPlugin))
-      return false;
-  }
-  return PlatformShouldLoadPlugin(info, plugins);
-}
-
 bool PluginList::FindPlugin(const std::string& mime_type,
                             bool allow_wildcard,
                             WebPluginInfo* info) {
   DCHECK(mime_type == StringToLowerASCII(mime_type));
 
   LoadPlugins(false);
   AutoLock lock(lock_);
   for (size_t i = 0; i < plugins_.size(); ++i) {
     if (SupportsType(plugins_[i], mime_type, allow_wildcard)) {
       *info = plugins_[i];
@@ skipping 98 matching lines @@
     }
   }
 
   return false;
 }
 
 void PluginList::Shutdown() {
   // TODO
 }
 
-// static
-void PluginList::UseInternalNaCl(PluginEntryPoints* entry_points) {
-  // We access the singleton directly, and not through Singleton(), since
-  // we don't want LoadPlugins() to be called.
-  g_singleton.Pointer()->use_internal_nacl_ = true;
-
-  const NPAPI::PluginVersionInfo nacl_plugin_info = {
-    FilePath(kNaClPluginLibraryName),
-    L"Native Client",
-    L"Statically linked NaCl",
-    L"1, 0, 0, 1",
-    L"application/x-nacl-srpc",
-    L"",
-    L"",
-    *entry_points
-  };
-
-  Singleton()->RegisterInternalPlugin(nacl_plugin_info);
-}
-
 } // namespace NPAPI