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

webkit/plugins/npapi/plugin_list_win.cc

Index: webkit/plugins/npapi/plugin_list_win.cc
===================================================================
--- webkit/plugins/npapi/plugin_list_win.cc	(revision 204062)
+++ webkit/plugins/npapi/plugin_list_win.cc	(working copy)
@@ -306,6 +306,10 @@
 }
 
 void PluginList::GetPluginDirectories(std::vector<base::FilePath>* plugin_dirs) {
+  if (PluginList::plugins_discovery_disabled_) {

[Bernhard Bauer, 2013/06/06 08:28:50]

Remove braces please, make the previous line fit into 80 columns.

[seva, 2013/06/06 22:11:25]

Done.

+    return;
+  }
+
   // We use a set for uniqueness, which we require, over order, which we do not.
   std::set<base::FilePath> dirs;
 
@@ -357,6 +361,10 @@
 }
 
 void PluginList::GetPluginPathsFromRegistry(std::vector<base::FilePath>* plugins) {
+  if (PluginList::plugins_discovery_disabled_) {

[Bernhard Bauer, 2013/06/06 08:28:50]

Same here.

[seva, 2013/06/06 22:11:25]

Done.

+    return;
+  }
+
   std::set<base::FilePath> plugin_dirs;
 
   GetPluginsInRegistryDirectory(