Merge 161210 - Only register the newer one of {bundled, component} Pepper Flash.

content/browser/plugin_service_impl.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.
 
 // This class responds to requests from renderers for the list of plugins, and
 // also a proxy object for plugin instances.
 
 #ifndef CONTENT_BROWSER_PLUGIN_SERVICE_IMPL_H_
 #define CONTENT_BROWSER_PLUGIN_SERVICE_IMPL_H_
 
@@ skipping 97 matching lines @@
   virtual void ForcePluginShutdown(const FilePath& plugin_path) OVERRIDE;
   virtual bool IsPluginUnstable(const FilePath& plugin_path) OVERRIDE;
   virtual void RefreshPlugins() OVERRIDE;
   virtual void AddExtraPluginPath(const FilePath& path) OVERRIDE;
   virtual void AddExtraPluginDir(const FilePath& path) OVERRIDE;
   virtual void RemoveExtraPluginPath(const FilePath& path) OVERRIDE;
   virtual void UnregisterInternalPlugin(const FilePath& path) OVERRIDE;
   virtual void RegisterInternalPlugin(
       const webkit::WebPluginInfo& info, bool add_at_beginning) OVERRIDE;
   virtual string16 GetPluginGroupName(const std::string& plugin_name) OVERRIDE;
+  virtual void GetInternalPlugins(
+      std::vector<webkit::WebPluginInfo>* plugins) OVERRIDE;
   virtual webkit::npapi::PluginList* GetPluginList() OVERRIDE;
   virtual void SetPluginListForTesting(
       webkit::npapi::PluginList* plugin_list) OVERRIDE;
 
   // Returns the plugin process host corresponding to the plugin process that
   // has been started by this service. This will start a process to host the
   // 'plugin_path' if needed. If the process fails to start, the return value
   // is NULL. Must be called on the IO thread.
   PluginProcessHost* FindOrStartNpapiPluginProcess(
       const FilePath& plugin_path);
@@ skipping 126 matching lines @@
   scoped_refptr<PluginLoaderPosix> plugin_loader_;
 #endif
 
   // Used to detect if a given plug-in is crashing over and over.
   std::map<FilePath, std::vector<base::Time> > crash_times_;
 
   DISALLOW_COPY_AND_ASSIGN(PluginServiceImpl);
 };
 
 #endif  // CONTENT_BROWSER_PLUGIN_SERVICE_IMPL_H_