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

content/public/browser/plugin_service.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 CONTENT_PUBLIC_BROWSER_PLUGIN_SERVICE_H_
 #define CONTENT_PUBLIC_BROWSER_PLUGIN_SERVICE_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 116 matching lines @@
   // accidentally load plugins in the wrong process or thread. Refer to
   // PluginList for further documentation of these functions.
   virtual void RefreshPlugins() = 0;
   virtual void AddExtraPluginPath(const FilePath& path) = 0;
   virtual void AddExtraPluginDir(const FilePath& path) = 0;
   virtual void RemoveExtraPluginPath(const FilePath& path) = 0;
   virtual void UnregisterInternalPlugin(const FilePath& path) = 0;
   virtual void RegisterInternalPlugin(const webkit::WebPluginInfo& info,
                                       bool add_at_beginning) = 0;
   virtual string16 GetPluginGroupName(const std::string& plugin_name) = 0;
-  virtual void GetInternalPlugins(
-      std::vector<webkit::WebPluginInfo>* plugins) = 0;
 
   // TODO(dpranke): This should be private.
   virtual webkit::npapi::PluginList* GetPluginList() = 0;
 
   virtual void SetPluginListForTesting(
       webkit::npapi::PluginList* plugin_list) = 0;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_PLUGIN_SERVICE_H_