Broke ContentSettingBubbleModelTest.Plugins on Android.

chrome/browser/plugins/chrome_plugin_service_filter.h

Index: chrome/browser/plugins/chrome_plugin_service_filter.h
===================================================================
--- chrome/browser/plugins/chrome_plugin_service_filter.h	(revision 180109)
+++ chrome/browser/plugins/chrome_plugin_service_filter.h	(working copy)
@@ -6,7 +6,6 @@
 #define CHROME_BROWSER_PLUGINS_CHROME_PLUGIN_SERVICE_FILTER_H_
 
 #include <map>
-#include <set>
 #include <vector>
 
 #include "base/file_path.h"
@@ -51,14 +50,8 @@
   // Lifts a restriction on a plug-in.
   void UnrestrictPlugin(const FilePath& plugin_path);
 
-  // Authorizes a given plug-in for a given process.
-  void AuthorizePlugin(int render_process_id, const FilePath& plugin_path);
-
-  // Authorizes all plug-ins for a given process.
-  void AuthorizeAllPlugins(int render_process_id);
-
   // PluginServiceFilter implementation:
-  virtual bool IsPluginEnabled(
+  virtual bool ShouldUsePlugin(
       int render_process_id,
       int render_view_id,
       const void* context,
@@ -66,32 +59,16 @@
       const GURL& policy_url,
       webkit::WebPluginInfo* plugin) OVERRIDE;
 
-  // CanLoadPlugin always grants permission to the browser
-  // (render_process_id == 0)
-  virtual bool CanLoadPlugin(
-      int render_process_id,
-      const FilePath& path) OVERRIDE;
-
  private:
   friend struct DefaultSingletonTraits<ChromePluginServiceFilter>;
 
   struct OverriddenPlugin {
-    OverriddenPlugin();
-    ~OverriddenPlugin();
-
+    int render_process_id;
     int render_view_id;
     GURL url;  // If empty, the override applies to all urls in render_view.
     webkit::WebPluginInfo plugin;
   };
 
-  struct ProcessDetails {
-    ProcessDetails();
-    ~ProcessDetails();
-
-    std::vector<OverriddenPlugin> overridden_plugins;
-    std::set<FilePath> authorized_plugins;
-  };
-
   ChromePluginServiceFilter();
   virtual ~ChromePluginServiceFilter();
 
@@ -100,9 +77,6 @@
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
-  ProcessDetails* GetOrRegisterProcess(int render_process_id);
-  const ProcessDetails* GetProcess(int render_process_id) const;
-
   content::NotificationRegistrar registrar_;
 
   base::Lock lock_;  // Guards access to member variables.
@@ -113,7 +87,7 @@
   typedef std::map<const void*, scoped_refptr<PluginPrefs> > ResourceContextMap;
   ResourceContextMap resource_context_map_;
 
-  std::map<int, ProcessDetails> plugin_details_;
+  std::vector<OverriddenPlugin> overridden_plugins_;
 };
 
 #endif  // CHROME_BROWSER_PLUGINS_CHROME_PLUGIN_SERVICE_FILTER_H_