Index: content/browser/plugin_service_impl.h |
=================================================================== |
--- content/browser/plugin_service_impl.h (revision 212185) |
+++ content/browser/plugin_service_impl.h (working copy) |
@@ -101,15 +101,14 @@ |
virtual bool IsPluginUnstable(const base::FilePath& plugin_path) OVERRIDE; |
virtual void RefreshPlugins() OVERRIDE; |
virtual void AddExtraPluginPath(const base::FilePath& path) OVERRIDE; |
- virtual void AddExtraPluginDir(const base::FilePath& path) OVERRIDE; |
virtual void RemoveExtraPluginPath(const base::FilePath& path) OVERRIDE; |
- virtual void UnregisterInternalPlugin(const base::FilePath& path) OVERRIDE; |
+ virtual void AddExtraPluginDir(const base::FilePath& path) OVERRIDE; |
virtual void RegisterInternalPlugin( |
const webkit::WebPluginInfo& info, bool add_at_beginning) OVERRIDE; |
+ virtual void UnregisterInternalPlugin(const base::FilePath& path) OVERRIDE; |
virtual void GetInternalPlugins( |
std::vector<webkit::WebPluginInfo>* plugins) OVERRIDE; |
- virtual void SetPluginListForTesting( |
- webkit::npapi::PluginList* plugin_list) OVERRIDE; |
+ virtual void DisablePluginsDiscoveryForTesting() OVERRIDE; |
#if defined(OS_MACOSX) |
virtual void AppActivated() OVERRIDE; |
#endif |
@@ -207,9 +206,6 @@ |
const base::FilePath& path); |
#endif |
- // The plugin list instance. |
- webkit::npapi::PluginList* plugin_list_; |
- |
#if defined(OS_WIN) |
// Registry keys for getting notifications when new plugins are installed. |
base::win::RegKey hkcu_key_; |