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

webkit/plugins/npapi/plugin_list.cc

Index: webkit/plugins/npapi/plugin_list.cc
===================================================================
--- webkit/plugins/npapi/plugin_list.cc	(revision 204062)
+++ webkit/plugins/npapi/plugin_list.cc	(working copy)
@@ -79,6 +79,10 @@
       switches::kDebugPluginLoading);
 }
 
+void PluginList::DisablePluginsDiscovery() {
+  plugins_discovery_disabled_ = true;
+}
+
 void PluginList::RefreshPlugins() {
   base::AutoLock lock(lock_);
   loading_state_ = LOADING_STATE_NEEDS_REFRESH;
@@ -237,7 +241,8 @@
 #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(
@@ -346,7 +351,7 @@
       GetPluginsInDir(directories_to_scan[i], plugin_paths);
 
 #if defined(OS_WIN)
-  GetPluginPathsFromRegistry(plugin_paths);
+    GetPluginPathsFromRegistry(plugin_paths);
 #endif
   }
 }