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

webkit/plugins/npapi/plugin_list_mac.mm

 // 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"
 
 #import <Carbon/Carbon.h>
 #import <Foundation/Foundation.h>
 
 #include "base/file_util.h"
@@ skipping 257 matching lines @@
 
   if (ReadPlistPluginInfo(filename, bundle.get(), info))
     return true;
 
   // ... or not
 
   return false;
 }
 
 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.

Also, can you make the previous line fit into 80 columns?

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

Done.

+    return;
+  }
+
   // Load from the user's area
   GetPluginCommonDirectory(plugin_dirs, true);
 
   // Load from the machine-wide area
   GetPluginCommonDirectory(plugin_dirs, false);
 }
 
 void PluginList::GetPluginsInDir(
     const base::FilePath& path, std::vector<base::FilePath>* plugins) {
   file_util::FileEnumerator enumerator(path,
                                        false, // not recursive
                                        file_util::FileEnumerator::DIRECTORIES);
   for (base::FilePath path = enumerator.Next(); !path.value().empty();
        path = enumerator.Next()) {
     plugins->push_back(path);
   }
 }
 
 bool PluginList::ShouldLoadPluginUsingPluginList(
     const WebPluginInfo& info,
     std::vector<webkit::WebPluginInfo>* plugins) {
   return !IsBlacklistedPlugin(info);
 }
 
 }  // namespace npapi
 }  // namespace webkit