Replace the GetAssociatedRenderView call with GetAssociatedRenderFrame in SSLClientAuthHandler.

BUG=304341
R=nasko@chromium.org

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

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

7 files changed, 21 insertions, 14 deletions

diff --git a/android_webview/browser/aw_content_browser_client.cc b/android_webview/browser/aw_content_browser_client.cc
index e19d63d..4623457 100644
--- a/android_webview/browser/aw_content_browser_client.cc
+++ b/android_webview/browser/aw_content_browser_client.cc
@@ -343,7 +343,7 @@ void AwContentBrowserClient::AllowCertificateError(
 
 void AwContentBrowserClient::SelectClientCertificate(
       int render_process_id,
-      int render_view_id,
+      int render_frame_id,
       const net::HttpNetworkSession* network_session,
       net::SSLCertRequestInfo* cert_request_info,
       const base::Callback<void(net::X509Certificate*)>& callback) {
diff --git a/android_webview/browser/aw_content_browser_client.h b/android_webview/browser/aw_content_browser_client.h
index ac15cc7..472dd2f 100644
--- a/android_webview/browser/aw_content_browser_client.h
+++ b/android_webview/browser/aw_content_browser_client.h
@@ -105,7 +105,7 @@ class AwContentBrowserClient : public content::ContentBrowserClient {
       content::CertificateRequestResultType* result) OVERRIDE;
   virtual void SelectClientCertificate(
       int render_process_id,
-      int render_view_id,
+      int render_frame_id,
       const net::HttpNetworkSession* network_session,
       net::SSLCertRequestInfo* cert_request_info,
       const base::Callback<void(net::X509Certificate*)>& callback) OVERRIDE;
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 5d84306..8558948 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -114,6 +114,7 @@
 #include "content/public/browser/browser_url_handler.h"
 #include "content/public/browser/child_process_data.h"
 #include "content/public/browser/child_process_security_policy.h"
+#include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/resource_context.h"
@@ -1803,12 +1804,18 @@ void ChromeContentBrowserClient::AllowCertificateError(
 
 void ChromeContentBrowserClient::SelectClientCertificate(
     int render_process_id,
-    int render_view_id,
+    int render_frame_id,
     const net::HttpNetworkSession* network_session,
     net::SSLCertRequestInfo* cert_request_info,
     const base::Callback<void(net::X509Certificate*)>& callback) {
-  WebContents* tab = tab_util::GetWebContentsByID(
-      render_process_id, render_view_id);
+  content::RenderFrameHost* rfh = content::RenderFrameHost::FromID(
+      render_process_id, render_frame_id);
+  if (!rfh) {
+    NOTREACHED();
+    return;
+  }
+
+  WebContents* tab = WebContents::FromRenderFrameHost(rfh);
   if (!tab) {
     NOTREACHED();
     return;
diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h
index 6387bf6..99ccb01 100644
--- a/chrome/browser/chrome_content_browser_client.h
+++ b/chrome/browser/chrome_content_browser_client.h
@@ -165,7 +165,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
       content::CertificateRequestResultType* request) OVERRIDE;
   virtual void SelectClientCertificate(
       int render_process_id,
-      int render_view_id,
+      int render_frame_id,
       const net::HttpNetworkSession* network_session,
       net::SSLCertRequestInfo* cert_request_info,
       const base::Callback<void(net::X509Certificate*)>& callback) OVERRIDE;
diff --git a/content/browser/ssl/ssl_client_auth_handler.cc b/content/browser/ssl/ssl_client_auth_handler.cc
index 60d57d4..b7fe9f0 100644
--- a/content/browser/ssl/ssl_client_auth_handler.cc
+++ b/content/browser/ssl/ssl_client_auth_handler.cc
@@ -80,10 +80,10 @@ void SSLClientAuthHandler::DidGetClientCerts() {
   }
 
   int render_process_host_id;
-  int render_view_host_id;
-  if (!ResourceRequestInfo::ForRequest(request_)->GetAssociatedRenderView(
+  int render_frame_host_id;
+  if (!ResourceRequestInfo::ForRequest(request_)->GetAssociatedRenderFrame(
           &render_process_host_id,
-          &render_view_host_id))
+          &render_frame_host_id))
     NOTREACHED();
 
   // If the RVH does not exist by the time this task gets run, then the task
@@ -94,7 +94,7 @@ void SSLClientAuthHandler::DidGetClientCerts() {
       BrowserThread::UI, FROM_HERE,
       base::Bind(
           &SSLClientAuthHandler::DoSelectCertificate, this,
-          render_process_host_id, render_view_host_id));
+          render_process_host_id, render_frame_host_id));
 }
 
 void SSLClientAuthHandler::DoCertificateSelected(net::X509Certificate* cert) {
@@ -113,10 +113,10 @@ void SSLClientAuthHandler::DoCertificateSelected(net::X509Certificate* cert) {
 }
 
 void SSLClientAuthHandler::DoSelectCertificate(
-    int render_process_host_id, int render_view_host_id) {
+    int render_process_host_id, int render_frame_host_id) {
   GetContentClient()->browser()->SelectClientCertificate(
       render_process_host_id,
-      render_view_host_id,
+      render_frame_host_id,
       http_network_session_,
       cert_request_info_.get(),
       base::Bind(&SSLClientAuthHandler::CertificateSelected, this));
diff --git a/content/browser/ssl/ssl_client_auth_handler.h b/content/browser/ssl/ssl_client_auth_handler.h
index bbc7747..b848d54 100644
--- a/content/browser/ssl/ssl_client_auth_handler.h
+++ b/content/browser/ssl/ssl_client_auth_handler.h
@@ -66,7 +66,7 @@ class CONTENT_EXPORT SSLClientAuthHandler
 
   // Selects a client certificate on the UI thread.
   void DoSelectCertificate(int render_process_host_id,
-                           int render_view_host_id);
+                           int render_frame_host_id);
 
   // The net::URLRequest that triggered this client auth.
   net::URLRequest* request_;
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index c87f31c2..8878a9a 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -401,7 +401,7 @@ class CONTENT_EXPORT ContentBrowserClient {
   // certificate was selected NULL is returned to the |callback|.
   virtual void SelectClientCertificate(
       int render_process_id,
-      int render_view_id,
+      int render_frame_id,
       const net::HttpNetworkSession* network_session,
       net::SSLCertRequestInfo* cert_request_info,
       const base::Callback<void(net::X509Certificate*)>& callback) {}