Preparing rollback in case things don't work out....

webkit/glue/plugins/plugin_list.h

 // Copyright (c) 2006-2008 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_GLUE_PLUGIN_PLUGIN_LIST_H__
 #define WEBKIT_GLUE_PLUGIN_PLUGIN_LIST_H__
 
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 11 matching lines @@
 template <typename T>
 struct DefaultLazyInstanceTraits;
 
 }  // namespace base
 
 namespace NPAPI
 {
 
 #define kDefaultPluginLibraryName FILE_PATH_LITERAL("default_plugin")
 #define kGearsPluginLibraryName FILE_PATH_LITERAL("gears")
-#define kNaClPluginLibraryName FILE_PATH_LITERAL("internal_nacl")
 
 class PluginInstance;
 
 // This struct holds entry points into a plugin.  The entry points are
 // slightly different between Linux and other platforms.
 struct PluginEntryPoints {
 #if !defined(OS_LINUX) && !defined(OS_FREEBSD)
   NP_GetEntryPointsFunc np_getentrypoints;
 #endif
   NP_InitializeFunc np_initialize;
@@ skipping 56 matching lines @@
   // internally-owned PluginEntryPoints pointer.
   // Returns false if the library couldn't be found, or if it's not a plugin.
   bool ReadPluginInfo(const FilePath& filename,
                       WebPluginInfo* info,
                       const PluginEntryPoints** entry_points);
 
   // Populate a WebPluginInfo from a PluginVersionInfo.
   static bool CreateWebPluginInfo(const PluginVersionInfo& pvi,
                                   WebPluginInfo* info);
 
-  // Set NativeClient plugin mode (avoid loading both the built-in and
-  // the external version of the plugin). The arguments provide pointers
-  // to NaCl plugin entry points - the functions are not referenced directly
-  // from this class to avoid introducing dependency between Webkit glue
-  // library and NaCl code.
-  static void UseInternalNaCl(PluginEntryPoints* entry_points);
-
   // Shutdown all plugins.  Should be called at process teardown.
   void Shutdown();
 
   // Get all the plugins
   void GetPlugins(bool refresh, std::vector<WebPluginInfo>* plugins);
 
   // Returns true if a plugin is found for the given url and mime type.
   // The mime type which corresponds to the URL is optionally returned
   // back.
   // The allow_wildcard parameter controls whether this function returns
@@ skipping 23 matching lines @@
   // Load all plugins from a specific directory
   void LoadPluginsFromDir(const FilePath& path,
                           std::vector<WebPluginInfo>* plugins);
 
   // Returns true if we should load the given plugin, or false otherwise.
   // plugins is the list of plugins we have crawled in the current plugin
   // loading run.
   bool ShouldLoadPlugin(const WebPluginInfo& info,
                         std::vector<WebPluginInfo>* plugins);
 
-  // Returns true if we should load the given plugin, or false otherwise.
-  // This function is platform-specific and is called from ShouldLoadPlugin.
-  bool PlatformShouldLoadPlugin(const WebPluginInfo& info,
-                                std::vector<WebPluginInfo>* plugins);
-
   // Find a plugin by mime type.
   // The allow_wildcard parameter controls whether this function returns
   // plugins which support wildcard mime types (* as the mime type)
   bool FindPlugin(const std::string &mime_type,
                   bool allow_wildcard,
                   WebPluginInfo* info);
 
   // Find a plugin by extension. Returns the corresponding mime type.
   bool FindPlugin(const GURL &url,
                   std::string* actual_mime_type,
@@ skipping 44 matching lines @@
 
   // Extra plugin paths that we want to search when loading.
   std::vector<FilePath> extra_plugin_paths_;
 
   // Extra plugin directories that we want to search when loading.
   std::vector<FilePath> extra_plugin_dirs_;
 
   // Holds information about internal plugins.
   std::vector<PluginVersionInfo> internal_plugins_;
 
-  // true if we should use our internal Native Client plugin
-  bool use_internal_nacl_;
-
   // Need synchronization for the above members since this object can be
   // accessed on multiple threads.
   Lock lock_;
 
   friend struct base::DefaultLazyInstanceTraits<PluginList>;
 
   DISALLOW_COPY_AND_ASSIGN(PluginList);
 };
 
 } // namespace NPAPI
 
 #endif  // WEBKIT_GLUE_PLUGIN_PLUGIN_LIST_H__