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 204507)
+++ webkit/plugins/npapi/plugin_list_win.cc	(working copy)
@@ -305,7 +305,11 @@
   return true;
 }
 
-void PluginList::GetPluginDirectories(std::vector<base::FilePath>* plugin_dirs) {
+void PluginList::GetPluginDirectories(
+    std::vector<base::FilePath>* plugin_dirs) {
+  if (PluginList::plugins_discovery_disabled_)
+    return;
+
   // We use a set for uniqueness, which we require, over order, which we do not.
   std::set<base::FilePath> dirs;
 
@@ -357,6 +361,9 @@
 }
 
 void PluginList::GetPluginPathsFromRegistry(std::vector<base::FilePath>* plugins) {

[Bernhard Bauer, 2013/06/07 10:33:43]

Can you make this fit into 80 columns please?

(I guess there was a refactoring here to move FilePath into the base namespace
that pushed these over the limit.)

[seva, 2013/06/07 19:02:36]

Done.

+  if (PluginList::plugins_discovery_disabled_)
+    return;
+
   std::set<base::FilePath> plugin_dirs;
 
   GetPluginsInRegistryDirectory(