A bunch of work to transition from render_view_id to render_frame_id.

-remove ResourceRequestInfo::GetRenderViewForRequest
-reduce usage of GetAssociatedRenderView and add GetAssociatedRenderFrame which will replace it
-move the cookie jar from RenderView to RenderFrame
-switch most of the usages of RenderView to RenderFrame in WebPluginImpl

BUG=304341
R=boliu@chromium.org, nasko@chromium.org

Review URL: https://codereview.chromium.org/114573003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242200 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 8 insertions, 8 deletions

diff --git a/content/child/npapi/plugin_url_fetcher.cc b/content/child/npapi/plugin_url_fetcher.cc
index b4ca047..9a1d1d4 100644
--- a/content/child/npapi/plugin_url_fetcher.cc
+++ b/content/child/npapi/plugin_url_fetcher.cc
@@ -79,7 +79,7 @@ PluginURLFetcher::PluginURLFetcher(PluginStreamUrl* plugin_stream,
                                    bool notify_redirects,
                                    bool is_plugin_src_load,
                                    int origin_pid,
-                                   int render_view_id,
+                                   int render_frame_id,
                                    unsigned long resource_id)
     : plugin_stream_(plugin_stream),
       url_(url),
@@ -99,7 +99,7 @@ PluginURLFetcher::PluginURLFetcher(PluginStreamUrl* plugin_stream,
   request_info.load_flags = net::LOAD_NORMAL;
   request_info.requestor_pid = origin_pid;
   request_info.request_type = ResourceType::OBJECT;
-  request_info.routing_id = render_view_id;
+  request_info.routing_id = render_frame_id;
 
   std::vector<char> body;
   if (method == "POST") {
diff --git a/content/child/npapi/plugin_url_fetcher.h b/content/child/npapi/plugin_url_fetcher.h
index 45dcf36..b7cf4ec 100644
--- a/content/child/npapi/plugin_url_fetcher.h
+++ b/content/child/npapi/plugin_url_fetcher.h
@@ -32,7 +32,7 @@ class PluginURLFetcher : public webkit_glue::ResourceLoaderBridge::Peer {
                    bool notify_redirects,
                    bool is_plugin_src_load,
                    int origin_pid,
-                   int render_view_id,
+                   int render_frame_id,
                    unsigned long resource_id);
   virtual ~PluginURLFetcher();
 
diff --git a/content/child/npapi/webplugin_delegate.h b/content/child/npapi/webplugin_delegate.h
index c419a3f..0a647be 100644
--- a/content/child/npapi/webplugin_delegate.h
+++ b/content/child/npapi/webplugin_delegate.h
@@ -142,7 +142,7 @@ class WebPluginDelegate {
                         bool notify_redirects,
                         bool is_plugin_src_load,
                         int origin_pid,
-                        int render_view_id) = 0;
+                        int render_frame_id) = 0;
 
 };
 
diff --git a/content/child/npapi/webplugin_delegate_impl.cc b/content/child/npapi/webplugin_delegate_impl.cc
index b9e64a7..dc56e68 100644
--- a/content/child/npapi/webplugin_delegate_impl.cc
+++ b/content/child/npapi/webplugin_delegate_impl.cc
@@ -310,7 +310,7 @@ void WebPluginDelegateImpl::FetchURL(unsigned long resource_id,
                                      bool notify_redirects,
                                      bool is_plugin_src_load,
                                      int origin_pid,
-                                     int render_view_id) {
+                                     int render_frame_id) {
   // TODO(jam): once we switch over to resource loading always happening in this
   // code path, remove WebPluginResourceClient abstraction.
   PluginStreamUrl* plugin_stream = instance()->CreateStream(
@@ -319,7 +319,7 @@ void WebPluginDelegateImpl::FetchURL(unsigned long resource_id,
   plugin_stream->SetPluginURLFetcher(new PluginURLFetcher(
       plugin_stream, url, first_party_for_cookies, method, buf, len,
       referrer, notify_redirects, is_plugin_src_load, origin_pid,
-      render_view_id, resource_id));
+      render_frame_id, resource_id));
 }
 
 }  // namespace content
diff --git a/content/child/npapi/webplugin_delegate_impl.h b/content/child/npapi/webplugin_delegate_impl.h
index e3bfc46..e072b6c 100644
--- a/content/child/npapi/webplugin_delegate_impl.h
+++ b/content/child/npapi/webplugin_delegate_impl.h
@@ -128,7 +128,7 @@ class WebPluginDelegateImpl : public WebPluginDelegate {
                         bool notify_redirects,
                         bool is_plugin_src_load,
                         int origin_pid,
-                        int render_view_id) OVERRIDE;
+                        int render_frame_id) OVERRIDE;
   // End of WebPluginDelegate implementation.
 
   gfx::PluginWindowHandle windowed_handle() const { return windowed_handle_; }
diff --git a/content/child/plugin_messages.h b/content/child/plugin_messages.h
index 92651e9..3a97d10 100644
--- a/content/child/plugin_messages.h
+++ b/content/child/plugin_messages.h
@@ -62,7 +62,7 @@ IPC_STRUCT_BEGIN(PluginMsg_FetchURL_Params)
   IPC_STRUCT_MEMBER(GURL, referrer)
   IPC_STRUCT_MEMBER(bool, notify_redirect)
   IPC_STRUCT_MEMBER(bool, is_plugin_src_load)
-  IPC_STRUCT_MEMBER(int, render_view_id)
+  IPC_STRUCT_MEMBER(int, render_frame_id)
 IPC_STRUCT_END()
 
 IPC_STRUCT_BEGIN(PluginMsg_UpdateGeometry_Param)