Add a WebContents getter callback in ResourceRequestInfo

content/browser/ssl/ssl_error_handler.cc

Index: content/browser/ssl/ssl_error_handler.cc
diff --git a/content/browser/ssl/ssl_error_handler.cc b/content/browser/ssl/ssl_error_handler.cc
index 45b6dfd830ce6a3ab66d3c582812ddd418e0f226..2a37086ad90596183384b42468b1e00d28b7dc71 100644
--- a/content/browser/ssl/ssl_error_handler.cc
+++ b/content/browser/ssl/ssl_error_handler.cc
@@ -18,15 +18,14 @@ using net::SSLInfo;
 
 namespace content {
 
-SSLErrorHandler::SSLErrorHandler(const base::WeakPtr<Delegate>& delegate,
-                                 ResourceType resource_type,
-                                 const GURL& url,
-                                 int render_process_id,
-                                 int render_frame_id)
+SSLErrorHandler::SSLErrorHandler(
+    const base::WeakPtr<Delegate>& delegate,
+    ResourceType resource_type,
+    const GURL& url,
+    const ResourceRequestInfo::WebContentsGetterOnUI& web_contents_getter)
     : manager_(NULL),
       delegate_(delegate),
-      render_process_id_(render_process_id),
-      render_frame_id_(render_frame_id),
+      web_contents_getter_(web_contents_getter),
       request_url_(url),
       resource_type_(resource_type),
       request_has_been_notified_(false) {
@@ -58,10 +57,7 @@ SSLCertErrorHandler* SSLErrorHandler::AsSSLCertErrorHandler() {
 void SSLErrorHandler::Dispatch() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
-  WebContents* web_contents = NULL;
-  RenderFrameHost* render_frame_host =
-      RenderFrameHost::FromID(render_process_id_, render_frame_id_);
-  web_contents = WebContents::FromRenderFrameHost(render_frame_host);
+  WebContents* web_contents = web_contents_getter_.Run();
 
   if (!web_contents) {
     // We arrived on the UI thread, but the tab we're looking for is no longer