Replace the GetAssociatedRenderView call with GetAssociatedRenderFrame in ResourceLoader and SSLClientAuthHandler.

BUG=304341
R=nasko@chromium.org

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

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

7 files changed, 18 insertions, 19 deletions

diff --git a/android_webview/browser/aw_content_browser_client.cc b/android_webview/browser/aw_content_browser_client.cc
index 4623457..3502bc9 100644
--- a/android_webview/browser/aw_content_browser_client.cc
+++ b/android_webview/browser/aw_content_browser_client.cc
@@ -91,13 +91,13 @@ bool AwContentsMessageFilter::OnMessageReceived(const IPC::Message& message,
 }
 
 void AwContentsMessageFilter::OnShouldOverrideUrlLoading(
-    int routing_id,
+    int render_frame_id,
     const base::string16& url,
     bool* ignore_navigation) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   *ignore_navigation = false;
   AwContentsClientBridgeBase* client =
-      AwContentsClientBridgeBase::FromID(process_id_, routing_id);
+      AwContentsClientBridgeBase::FromID(process_id_, render_frame_id);
   if (client) {
     *ignore_navigation = client->ShouldOverrideUrlLoading(url);
   } else {
@@ -318,7 +318,7 @@ AwContentBrowserClient::CreateQuotaPermissionContext() {
 
 void AwContentBrowserClient::AllowCertificateError(
     int render_process_id,
-    int render_view_id,
+    int render_frame_id,
     int cert_error,
     const net::SSLInfo& ssl_info,
     const GURL& request_url,
@@ -327,9 +327,8 @@ void AwContentBrowserClient::AllowCertificateError(
     bool strict_enforcement,
     const base::Callback<void(bool)>& callback,
     content::CertificateRequestResultType* result) {
-
   AwContentsClientBridgeBase* client =
-      AwContentsClientBridgeBase::FromID(render_process_id, render_view_id);
+      AwContentsClientBridgeBase::FromID(render_process_id, render_frame_id);
   bool cancel_request = true;
   if (client)
     client->AllowCertificateError(cert_error,
diff --git a/android_webview/browser/aw_content_browser_client.h b/android_webview/browser/aw_content_browser_client.h
index 472dd2f..9ed0c6e 100644
--- a/android_webview/browser/aw_content_browser_client.h
+++ b/android_webview/browser/aw_content_browser_client.h
@@ -94,7 +94,7 @@ class AwContentBrowserClient : public content::ContentBrowserClient {
       CreateQuotaPermissionContext() OVERRIDE;
   virtual void AllowCertificateError(
       int render_process_id,
-      int render_view_id,
+      int render_frame_id,
       int cert_error,
       const net::SSLInfo& ssl_info,
       const GURL& request_url,
diff --git a/android_webview/browser/aw_contents_client_bridge_base.cc b/android_webview/browser/aw_contents_client_bridge_base.cc
index 2e7b62c..10d2c6c 100644
--- a/android_webview/browser/aw_contents_client_bridge_base.cc
+++ b/android_webview/browser/aw_contents_client_bridge_base.cc
@@ -5,7 +5,7 @@
 #include "android_webview/browser/aw_contents_client_bridge_base.h"
 
 #include "content/public/browser/browser_thread.h"
-#include "content/public/browser/render_view_host.h"
+#include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 
 using content::BrowserThread;
@@ -56,13 +56,13 @@ AwContentsClientBridgeBase* AwContentsClientBridgeBase::FromWebContents(
 // static
 AwContentsClientBridgeBase* AwContentsClientBridgeBase::FromID(
     int render_process_id,
-    int render_view_id) {
+    int render_frame_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  const content::RenderViewHost* rvh =
-      content::RenderViewHost::FromID(render_process_id, render_view_id);
-  if (!rvh) return NULL;
+  content::RenderFrameHost* rfh =
+      content::RenderFrameHost::FromID(render_process_id, render_frame_id);
+  if (!rfh) return NULL;
   content::WebContents* web_contents =
-      content::WebContents::FromRenderViewHost(rvh);
+      content::WebContents::FromRenderFrameHost(rfh);
   return UserData::GetContents(web_contents);
 }
 
diff --git a/android_webview/browser/aw_contents_client_bridge_base.h b/android_webview/browser/aw_contents_client_bridge_base.h
index 0383a37..a1b3b7f 100644
--- a/android_webview/browser/aw_contents_client_bridge_base.h
+++ b/android_webview/browser/aw_contents_client_bridge_base.h
@@ -34,7 +34,7 @@ class AwContentsClientBridgeBase {
   static AwContentsClientBridgeBase* FromWebContents(
       content::WebContents* web_contents);
   static AwContentsClientBridgeBase* FromID(int render_process_id,
-                                            int render_view_id);
+                                            int render_frame_id);
 
   virtual ~AwContentsClientBridgeBase();
 
diff --git a/android_webview/common/render_view_messages.h b/android_webview/common/render_view_messages.h
index 163d9c9..35266dd 100644
--- a/android_webview/common/render_view_messages.h
+++ b/android_webview/common/render_view_messages.h
@@ -107,6 +107,6 @@ IPC_MESSAGE_ROUTED1(AwViewHostMsg_OnContentsSizeChanged,
 // cornercases. This is sent before updating the NavigationController state
 // or creating a URLRequest for the main frame resource.
 IPC_SYNC_MESSAGE_CONTROL2_1(AwViewHostMsg_ShouldOverrideUrlLoading,
-                            int /* routing id */,
+                            int /* render_frame_id id */,
                             base::string16 /* in - url */,
                             bool /* out - result */)
diff --git a/android_webview/renderer/aw_content_renderer_client.cc b/android_webview/renderer/aw_content_renderer_client.cc
index 74f6db1..09f5a5c 100644
--- a/android_webview/renderer/aw_content_renderer_client.cc
+++ b/android_webview/renderer/aw_content_renderer_client.cc
@@ -19,8 +19,8 @@
 #include "content/public/common/url_constants.h"
 #include "content/public/renderer/document_state.h"
 #include "content/public/renderer/navigation_state.h"
+#include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_thread.h"
-#include "content/public/renderer/render_view.h"
 #include "net/base/net_errors.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
@@ -60,7 +60,7 @@ void AwContentRendererClient::RenderThreadStarted() {
 }
 
 bool AwContentRendererClient::HandleNavigation(
-    content::RenderView* view,
+    content::RenderFrame* render_frame,
     content::DocumentState* document_state,
     int opener_id,
     blink::WebFrame* frame,
@@ -107,9 +107,9 @@ bool AwContentRendererClient::HandleNavigation(
   bool ignore_navigation = false;
   base::string16 url =  request.url().string();
 
-  int routing_id = view->GetRoutingID();
+  int render_frame_id = render_frame->GetRoutingID();
   RenderThread::Get()->Send(new AwViewHostMsg_ShouldOverrideUrlLoading(
-      routing_id, url, &ignore_navigation));
+      render_frame_id, url, &ignore_navigation));
   return ignore_navigation;
 }
 
diff --git a/android_webview/renderer/aw_content_renderer_client.h b/android_webview/renderer/aw_content_renderer_client.h
index 3a55350..cbabaf1 100644
--- a/android_webview/renderer/aw_content_renderer_client.h
+++ b/android_webview/renderer/aw_content_renderer_client.h
@@ -41,7 +41,7 @@ class AwContentRendererClient : public content::ContentRendererClient {
   virtual void AddKeySystems(
       std::vector<content::KeySystemInfo>* key_systems) OVERRIDE;
 
-  virtual bool HandleNavigation(content::RenderView* view,
+  virtual bool HandleNavigation(content::RenderFrame* render_frame,
                                 content::DocumentState* document_state,
                                 int opener_id,
                                 blink::WebFrame* frame,