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

webkit/plugins/npapi/plugin_list.h

 // 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.
 
 #ifndef WEBKIT_PLUGINS_NPAPI_PLUGIN_LIST_H_
 #define WEBKIT_PLUGINS_NPAPI_PLUGIN_LIST_H_
 
 #include <set>
 #include <string>
 #include <utility>
@@ skipping 47 matching lines @@
   // Returns true if we're in debug-plugin-loading mode. This is controlled
   // by a command line switch.
   static bool DebugPluginLoading();
 
   // Returns true if the plugin supports |mime_type|. |mime_type| should be all
   // lower case.
   static bool SupportsType(const webkit::WebPluginInfo& plugin,
                            const std::string& mime_type,
                            bool allow_wildcard);
 
+  // Disables discovery of third_party plugins in common places next time

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

s/common/well-known/?

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

I don't know how well known these are :) everything is relative :)
How about "standard"?

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

Standard is relative as well, I guess ;-)

But "standard" is fine with me, actually. I just don't like "common" here
because it has too many meanings (shared? ordinary?).

+  // plugins are loaded.
+  void DisablePluginsDiscovery();
+
   // Cause the plugin list to refresh next time they are accessed, regardless
   // of whether they are already loaded.
   void RefreshPlugins();
 
   // Add/Remove an extra plugin to load when we actually do the loading.  Must
   // be called before the plugins have been loaded.
   void AddExtraPluginPath(const base::FilePath& plugin_path);
   void RemoveExtraPluginPath(const base::FilePath& plugin_path);
 
   // Same as above, but specifies a directory in which to search for plugins.
@@ skipping 104 matching lines @@
   static void ParseMIMEDescription(const std::string& description,
       std::vector<webkit::WebPluginMimeType>* mime_types);
 
   // Extract a version number from a description string.
   // This API is only used on Unixes, and is exposed here for testing.
   static void ExtractVersionString(const std::string& version,
                                    webkit::WebPluginInfo* info);
 #endif
 
  protected:
+  // Flag indicating whether third_party plugins will be searched for
+  // in common places.
+  bool plugins_discovery_disabled_;

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

I don't think this needs to be protected.

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

Indeed; moved down to private: section. Thanks.

+
   // Constructors are private for singletons but we expose this one
   // for subclasses for test purposes.
   PluginList();
 
  private:
   enum LoadingState {
     LOADING_STATE_NEEDS_REFRESH,
     LOADING_STATE_REFRESHING,
     LOADING_STATE_UP_TO_DATE,
   };
@@ skipping 82 matching lines @@
   // accessed on multiple threads.
   base::Lock lock_;
 
   DISALLOW_COPY_AND_ASSIGN(PluginList);
 };
 
 }  // namespace npapi
 }  // namespace webkit
 
 #endif  // WEBKIT_PLUGINS_NPAPI_PLUGIN_LIST_H_