Merge 180159

chrome/browser/chrome_plugin_service_filter.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 CHROME_BROWSER_CHROME_PLUGIN_SERVICE_FILTER_H_
 #define CHROME_BROWSER_CHROME_PLUGIN_SERVICE_FILTER_H_
 
 #include <map>
+#include <set>
 #include <vector>
 
 #include "base/file_path.h"
 #include "base/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/singleton.h"
 #include "base/synchronization/lock.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/plugin_service_filter.h"
@@ skipping 24 matching lines @@
 
   // Restricts the given plugin to the given profile and origin of the given
   // URL.
   void RestrictPluginToProfileAndOrigin(const FilePath& plugin_path,
                                         Profile* profile,
                                         const GURL& url);
 
   // 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 ShouldUsePlugin(
+  virtual bool IsPluginEnabled(
       int render_process_id,
       int render_view_id,
       const void* context,
       const GURL& url,
       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 {
-    int render_process_id;
+    OverriddenPlugin();
+    ~OverriddenPlugin();
+
     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();
 
   // content::NotificationObserver implementation:
   virtual void Observe(int type,
                        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.
   // Map of plugin paths to the origin they are restricted to.
   typedef std::pair<const void*, GURL> RestrictedPluginPair;
   typedef base::hash_map<FilePath, RestrictedPluginPair> RestrictedPluginMap;
   RestrictedPluginMap restricted_plugins_;
   typedef std::map<const void*, scoped_refptr<PluginPrefs> > ResourceContextMap;
   ResourceContextMap resource_context_map_;
 
-  std::vector<OverriddenPlugin> overridden_plugins_;
+  std::map<int, ProcessDetails> plugin_details_;
 };
 
 #endif  // CHROME_BROWSER_CHROME_PLUGIN_SERVICE_FILTER_H_