Move more of the plugin code in the renderer to use RenderFrame instead of RenderView.

content/browser/plugin_service_impl.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.
 
 // This class responds to requests from renderers for the list of plugins, and
 // also a proxy object for plugin instances.
 
 #ifndef CONTENT_BROWSER_PLUGIN_SERVICE_IMPL_H_
 #define CONTENT_BROWSER_PLUGIN_SERVICE_IMPL_H_
 
@@ skipping 41 matching lines @@
 class PluginDirWatcherDelegate;
 class PluginLoaderPosix;
 class PluginServiceFilter;
 class ResourceContext;
 struct PepperPluginInfo;
 
 // base::Bind() has limited arity, and the filter-related methods tend to
 // surpass that limit.
 struct PluginServiceFilterParams {
   int render_process_id;
-  int render_view_id;
+  int render_frame_id;
   GURL page_url;
   ResourceContext* resource_context;
 };
 
 class CONTENT_EXPORT PluginServiceImpl
     : NON_EXPORTED_BASE(public PluginService) {
  public:
   // Returns the PluginServiceImpl singleton.
   static PluginServiceImpl* GetInstance();
 
   // PluginService implementation:
   virtual void Init() OVERRIDE;
   virtual void StartWatchingPlugins() OVERRIDE;
   virtual bool GetPluginInfoArray(
       const GURL& url,
       const std::string& mime_type,
       bool allow_wildcard,
       std::vector<WebPluginInfo>* info,
       std::vector<std::string>* actual_mime_types) OVERRIDE;
   virtual bool GetPluginInfo(int render_process_id,
-                             int render_view_id,
+                             int render_frame_id,
                              ResourceContext* context,
                              const GURL& url,
                              const GURL& page_url,
                              const std::string& mime_type,
                              bool allow_wildcard,
                              bool* is_stale,
                              WebPluginInfo* info,
                              std::string* actual_mime_type) OVERRIDE;
   virtual bool GetPluginInfoByPath(const base::FilePath& plugin_path,
                                    WebPluginInfo* info) OVERRIDE;
@@ skipping 38 matching lines @@
       int render_process_id,
       const base::FilePath& plugin_path,
       const base::FilePath& profile_data_directory);
   PpapiPluginProcessHost* FindOrStartPpapiBrokerProcess(
       int render_process_id, const base::FilePath& plugin_path);
 
   // Opens a channel to a plugin process for the given mime type, starting
   // a new plugin process if necessary.  This must be called on the IO thread
   // or else a deadlock can occur.
   void OpenChannelToNpapiPlugin(int render_process_id,
-                                int render_view_id,
+                                int render_frame_id,
                                 const GURL& url,
                                 const GURL& page_url,
                                 const std::string& mime_type,
                                 PluginProcessHost::Client* client);
   void OpenChannelToPpapiPlugin(int render_process_id,
                                 const base::FilePath& plugin_path,
                                 const base::FilePath& profile_data_directory,
                                 PpapiPluginProcessHost::PluginClient* client);
   void OpenChannelToPpapiBroker(int render_process_id,
                                 const base::FilePath& path,
@@ skipping 35 matching lines @@
   // because more arity is needed <http://crbug.com/98542>. This just forwards.
   void ForwardGetAllowedPluginForOpenChannelToPlugin(
       const PluginServiceFilterParams& params,
       const GURL& url,
       const std::string& mime_type,
       PluginProcessHost::Client* client,
       const std::vector<WebPluginInfo>&);
   // Helper so we can do the plugin lookup on the FILE thread.
   void GetAllowedPluginForOpenChannelToPlugin(
       int render_process_id,
-      int render_view_id,
+      int render_frame_id,
       const GURL& url,
       const GURL& page_url,
       const std::string& mime_type,
       PluginProcessHost::Client* client,
       ResourceContext* resource_context);
 
   // Helper so we can finish opening the channel after looking up the
   // plugin.
   void FinishOpenChannelToPlugin(int render_process_id,
                                  const base::FilePath& plugin_path,
@@ skipping 35 matching lines @@
 
   // Used to detect if a given plug-in is crashing over and over.
   std::map<base::FilePath, std::vector<base::Time> > crash_times_;
 
   DISALLOW_COPY_AND_ASSIGN(PluginServiceImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_PLUGIN_SERVICE_IMPL_H_