Add a WebContents getter callback in ResourceRequestInfo

chrome/browser/chrome_content_browser_client.cc

Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index dd8724d2bf8d583a243a2ef823ee095be7b56c04..a6782a53559db91d295c3a0c8c81ca8ff4dcae66 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -1957,8 +1957,8 @@ ChromeContentBrowserClient::GetTemporaryStorageEvictionPolicy(
 }
 
 void ChromeContentBrowserClient::AllowCertificateError(
-    int render_process_id,
-    int render_frame_id,
+    const content::ResourceRequestInfo::WebContentsGetterOnUI&
+        web_contents_getter,

[davidben, 2015/11/19 17:46:13]

Rather than passing in this callback, it's probably better to pass in a
WebContents* and, in the case of no WebContents, have //content internally
switch to DENY if there is none. I'm not sure the NOTREACHED() in line 1983 is
valid anyway because IO stuff is destroyed a thread hop after UI stuff.

(Actually, I would even have put line 1971 inside //content, but it looks like
//android_webview screwed up. So we're probably stuck with that one for now.
Hrmf.)

Edit: Actually, I'm pretty sure it's impossible for there to be no WebContents
here. See comments in content/browser/ssl.

[clamy, 2015/11/20 13:50:42]

Since it's impossible not to have a WebContents here, I went with a DCHECK of
the WebContents.

     int cert_error,
     const net::SSLInfo& ssl_info,
     const GURL& request_url,
@@ -1978,9 +1978,7 @@ void ChromeContentBrowserClient::AllowCertificateError(
   }
 
   // If the tab is being prerendered, cancel the prerender and the request.
-  content::RenderFrameHost* render_frame_host =
-      content::RenderFrameHost::FromID(render_process_id, render_frame_id);
-  WebContents* tab = WebContents::FromRenderFrameHost(render_frame_host);
+  WebContents* tab = web_contents_getter.Run();
   if (!tab) {
     NOTREACHED();
     return;