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

content/browser/plugin_service_impl.cc

Index: content/browser/plugin_service_impl.cc
===================================================================
--- content/browser/plugin_service_impl.cc	(revision 238847)
+++ content/browser/plugin_service_impl.cc	(working copy)
@@ -367,7 +367,7 @@
 
 void PluginServiceImpl::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,
@@ -379,7 +379,7 @@
   // Make sure plugins are loaded if necessary.
   PluginServiceFilterParams params = {
     render_process_id,
-    render_view_id,
+    render_frame_id,
     page_url,
     client->GetResourceContext()
   };
@@ -430,14 +430,14 @@
     const std::string& mime_type,
     PluginProcessHost::Client* client,
     const std::vector<WebPluginInfo>&) {
-  GetAllowedPluginForOpenChannelToPlugin(params.render_process_id,
-      params.render_view_id, url, params.page_url, mime_type, client,
-      params.resource_context);
+  GetAllowedPluginForOpenChannelToPlugin(
+      params.render_process_id, params.render_frame_id, url, params.page_url,
+      mime_type, client, params.resource_context);
 }
 
 void PluginServiceImpl::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,
@@ -446,7 +446,7 @@
   WebPluginInfo info;
   bool allow_wildcard = true;
   bool found = GetPluginInfo(
-      render_process_id, render_view_id, resource_context,
+      render_process_id, render_frame_id, resource_context,
       url, page_url, mime_type, allow_wildcard,
       NULL, &info, NULL);
   base::FilePath plugin_path;
@@ -498,7 +498,7 @@
 }
 
 bool PluginServiceImpl::GetPluginInfo(int render_process_id,
-                                      int render_view_id,
+                                      int render_frame_id,
                                       ResourceContext* context,
                                       const GURL& url,
                                       const GURL& page_url,
@@ -516,7 +516,7 @@
 
   for (size_t i = 0; i < plugins.size(); ++i) {
     if (!filter_ || filter_->IsPluginAvailable(render_process_id,
-                                               render_view_id,
+                                               render_frame_id,
                                                context,
                                                url,
                                                page_url,