Remove NPAPI from browser and utility

chrome/browser/plugins/chrome_plugin_service_filter.h

Index: chrome/browser/plugins/chrome_plugin_service_filter.h
diff --git a/chrome/browser/plugins/chrome_plugin_service_filter.h b/chrome/browser/plugins/chrome_plugin_service_filter.h
index a90c94b69c4a47dfd5caf89595f18c03f1deb006..a84b367917dd3eaeb5a58c58e7f08ebc7e2e129a 100644
--- a/chrome/browser/plugins/chrome_plugin_service_filter.h
+++ b/chrome/browser/plugins/chrome_plugin_service_filter.h
@@ -47,15 +47,6 @@ class ChromePluginServiceFilter : public content::PluginServiceFilter,
                               const GURL& url,
                               const content::WebPluginInfo& plugin);
 
-  // Restricts the given plugin to the given profile and origin of the given
-  // URL.
-  void RestrictPluginToProfileAndOrigin(const base::FilePath& plugin_path,
-                                        Profile* profile,
-                                        const GURL& url);
-
-  // Lifts a restriction on a plugin.
-  void UnrestrictPlugin(const base::FilePath& plugin_path);
-
   // Authorizes a given plugin for a given process.
   void AuthorizePlugin(int render_process_id,
                        const base::FilePath& plugin_path);
@@ -68,18 +59,6 @@ class ChromePluginServiceFilter : public content::PluginServiceFilter,
                            bool load_blocked,
                            const std::string& identifier);
 
-  // Returns whether the plugin is found in |restricted_plugins_|.
-  bool IsPluginRestricted(const base::FilePath& plugin_path);
-
-#if defined(OS_WIN) || defined(OS_MACOSX)
-  // Called when browser can't find a plugin with specified |mime_type| and
-  // NPAPI plugins are disabled.
-  // TODO(wfh): Remove when NPAPI is gone.
-  void NPAPIPluginNotFound(int render_process_id,
-                           int render_frame_id,
-                           const std::string& mime_type);
-#endif
-
   // PluginServiceFilter implementation:
   bool IsPluginAvailable(int render_process_id,
                          int render_frame_id,
@@ -93,11 +72,6 @@ class ChromePluginServiceFilter : public content::PluginServiceFilter,
   bool CanLoadPlugin(int render_process_id,
                      const base::FilePath& path) override;
 
-  void NPAPIPluginLoaded(int render_process_id,
-                         int render_frame_id,
-                         const std::string& mime_type,
-                         const content::WebPluginInfo& info) override;
-
  private:
   friend struct base::DefaultSingletonTraits<ChromePluginServiceFilter>;
 
@@ -127,31 +101,16 @@ class ChromePluginServiceFilter : public content::PluginServiceFilter,
                const content::NotificationSource& source,
                const content::NotificationDetails& details) override;
 
-  void ShowNPAPIInfoBar(int render_process_id,
-                        int render_frame_id,
-                        const base::string16& name,
-                        const std::string& mime_type,
-                        bool is_removed);
-
   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.
-  // Map of plugin paths to the origin they are restricted to.
-  typedef std::pair<const void*, GURL> RestrictedPluginPair;
-  typedef base::hash_map<base::FilePath,
-                         RestrictedPluginPair> RestrictedPluginMap;
-  RestrictedPluginMap restricted_plugins_;
   typedef std::map<const void*, scoped_refptr<PluginPrefs> > ResourceContextMap;
   ResourceContextMap resource_context_map_;
 
   std::map<int, ProcessDetails> plugin_details_;
-
-  // Keeps track if loading a plugin has already trigged an infobar.
-  // Accessed on UI thread.
-  std::set<std::string> infobared_plugin_mime_types_;
 };
 
 #endif  // CHROME_BROWSER_PLUGINS_CHROME_PLUGIN_SERVICE_FILTER_H_