Add a WebContents getter callback in ResourceRequestInfo

chrome/browser/chrome_content_browser_client.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chrome_content_browser_client.h"
 
 #include <map>
 #include <set>
 #include <utility>
 #include <vector>
@@ skipping 1939 matching lines @@
 
 scoped_ptr<storage::QuotaEvictionPolicy>
 ChromeContentBrowserClient::GetTemporaryStorageEvictionPolicy(
     content::BrowserContext* context) {
   return SiteEngagementEvictionPolicy::IsEnabled()
              ? make_scoped_ptr(new SiteEngagementEvictionPolicy(context))
              : nullptr;
 }
 
 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,
     ResourceType resource_type,
     bool overridable,
     bool strict_enforcement,
     bool expired_previous_decision,
     const base::Callback<void(bool)>& callback,
     content::CertificateRequestResultType* result) {
   if (resource_type != content::RESOURCE_TYPE_MAIN_FRAME) {
     // A sub-resource has a certificate error.  The user doesn't really
     // have a context for making the right decision, so block the
     // request hard, without an info bar to allow showing the insecure
     // content.
     *result = content::CERTIFICATE_REQUEST_RESULT_TYPE_DENY;
     return;
   }
 
   // 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;
   }
 
   prerender::PrerenderContents* prerender_contents =
       prerender::PrerenderContents::FromWebContents(tab);
   if (prerender_contents) {
     prerender_contents->Destroy(prerender::FINAL_STATUS_SSL_ERROR);
     *result = content::CERTIFICATE_REQUEST_RESULT_TYPE_CANCEL;
@@ skipping 786 matching lines @@
   if (channel <= kMaxDisableEncryptionChannel) {
     static const char* const kWebRtcDevSwitchNames[] = {
       switches::kDisableWebRtcEncryption,
     };
     to_command_line->CopySwitchesFrom(from_command_line,
                                       kWebRtcDevSwitchNames,
                                       arraysize(kWebRtcDevSwitchNames));
   }
 }
 #endif  // defined(ENABLE_WEBRTC)