Adding --disable-plugins-discovery command line switch to not load third-party plugins from common …

webkit/plugins/npapi/plugin_list.cc

 // Copyright (c) 2012 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/plugins/npapi/plugin_list.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
@@ skipping 61 matching lines @@
 PluginList* PluginList::Singleton() {
   return g_singleton.Pointer();
 }
 
 // static
 bool PluginList::DebugPluginLoading() {
   return CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kDebugPluginLoading);
 }
 
+void PluginList::DisablePluginsDiscovery() {
+  plugins_discovery_disabled_ = true;
+}
+
 void PluginList::RefreshPlugins() {
   base::AutoLock lock(lock_);
   loading_state_ = LOADING_STATE_NEEDS_REFRESH;
 }
 
 void PluginList::AddExtraPluginPath(const base::FilePath& plugin_path) {
   if (!NPAPIPluginsSupported()) {
     // TODO(jam): remove and just have CHECK once we're sure this doesn't get
     // triggered.
     DLOG(INFO) << "NPAPI plugins not supported";
@@ skipping 138 matching lines @@
   }
 
   return true;
 }
 
 PluginList::PluginList()
     :
 #if defined(OS_WIN)
       dont_load_new_wmp_(false),
 #endif
-      loading_state_(LOADING_STATE_NEEDS_REFRESH) {
+      loading_state_(LOADING_STATE_NEEDS_REFRESH),
+      plugins_discovery_disabled_(false) {
 }
 
 void PluginList::LoadPluginsIntoPluginListInternal(
     std::vector<webkit::WebPluginInfo>* plugins) {
   base::Closure will_load_callback;
   {
     base::AutoLock lock(lock_);
     will_load_callback = will_load_plugins_callback_;
   }
   if (!will_load_callback.is_null())
@@ skipping 88 matching lines @@
     // Those are all internal plugins so we have to use extra_plugin_paths.
     for (size_t i = 0; i < extra_plugin_dirs.size(); ++i)
       GetPluginsInDir(extra_plugin_dirs[i], plugin_paths);
 
     std::vector<base::FilePath> directories_to_scan;
     GetPluginDirectories(&directories_to_scan);
     for (size_t i = 0; i < directories_to_scan.size(); ++i)
       GetPluginsInDir(directories_to_scan[i], plugin_paths);
 
 #if defined(OS_WIN)
-  GetPluginPathsFromRegistry(plugin_paths);
+    GetPluginPathsFromRegistry(plugin_paths);
 #endif
   }
 }
 
 void PluginList::SetPlugins(const std::vector<webkit::WebPluginInfo>& plugins) {
   base::AutoLock lock(lock_);
 
   DCHECK_NE(LOADING_STATE_REFRESHING, loading_state_);
   loading_state_ = LOADING_STATE_UP_TO_DATE;
 
@@ skipping 106 matching lines @@
   }
   return false;
 }
 
 PluginList::~PluginList() {
 }
 
 
 }  // namespace npapi
 }  // namespace webkit