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

webkit/plugins/npapi/plugin_list_win.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 <set>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
@@ skipping 287 matching lines @@
           version_info_win->GetStringValue(L"FileOpenName"),
           &info->mime_types)) {
     LOG_IF(ERROR, PluginList::DebugPluginLoading())
         << "Plugin " << info->name << " has bad MIME types, skipping";
     return false;
   }
 
   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;
 
   // Load from the application-specific area
   GetAppDirectory(&dirs);
 
   // Load from the executable area
   GetExeDirectory(&dirs);
 
   // Load Java
@@ skipping 30 matching lines @@
     if (!(find_file_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) {
       base::FilePath filename = path.Append(find_file_data.cFileName);
       plugins->push_back(filename);
     }
   } while (FindNextFile(find_handle, &find_file_data) != 0);
 
   DCHECK(GetLastError() == ERROR_NO_MORE_FILES);
   FindClose(find_handle);
 }
 
 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(
       HKEY_CURRENT_USER, kRegistryMozillaPlugins, &plugin_dirs);
   GetPluginsInRegistryDirectory(
       HKEY_LOCAL_MACHINE, kRegistryMozillaPlugins, &plugin_dirs);
 
   for (std::set<base::FilePath>::iterator i = plugin_dirs.begin();
        i != plugin_dirs.end(); ++i) {
     plugins->push_back(*i);
@@ skipping 88 matching lines @@
   // The plugin in question could be a 64 bit plugin which we cannot load.
   base::FilePath plugin_path(info.path);
   if (!IsValid32BitImage(base::MakeAbsoluteFilePath(plugin_path)))
     return false;
 #endif
   return true;
 }
 
 }  // namespace npapi
 }  // namespace webkit