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

1 files changed, 8 insertions, 8 deletions

diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/chrome_network_delegate.cc
index ba5eae6..57e15d6 100644
--- a/chrome/browser/net/chrome_network_delegate.cc
+++ b/chrome/browser/net/chrome_network_delegate.cc
@@ -650,13 +650,13 @@ bool ChromeNetworkDelegate::OnCanGetCookies(
       request.url(), request.first_party_for_cookies());
 
   int render_process_id = -1;
-  int render_view_id = -1;
-  if (content::ResourceRequestInfo::GetRenderViewForRequest(
-          &request, &render_process_id, &render_view_id)) {
+  int render_frame_id = -1;
+  if (content::ResourceRequestInfo::GetRenderFrameForRequest(
+          &request, &render_process_id, &render_frame_id)) {
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         base::Bind(&TabSpecificContentSettings::CookiesRead,
-                   render_process_id, render_view_id,
+                   render_process_id, render_frame_id,
                    request.url(), request.first_party_for_cookies(),
                    cookie_list, !allow));
   }
@@ -675,13 +675,13 @@ bool ChromeNetworkDelegate::OnCanSetCookie(const net::URLRequest& request,
       request.url(), request.first_party_for_cookies());
 
   int render_process_id = -1;
-  int render_view_id = -1;
-  if (content::ResourceRequestInfo::GetRenderViewForRequest(
-          &request, &render_process_id, &render_view_id)) {
+  int render_frame_id = -1;
+  if (content::ResourceRequestInfo::GetRenderFrameForRequest(
+          &request, &render_process_id, &render_frame_id)) {
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         base::Bind(&TabSpecificContentSettings::CookieChanged,
-                   render_process_id, render_view_id,
+                   render_process_id, render_frame_id,
                    request.url(), request.first_party_for_cookies(),
                    cookie_line, *options, !allow));
   }