Make UnsafeResource hold a WebContents getter instead of RenderFrame ids

chrome/browser/renderer_host/data_reduction_proxy_resource_throttle_android.cc

 // Copyright 2015 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/renderer_host/data_reduction_proxy_resource_throttle_android.h"
 
 #include "base/logging.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prerender/prerender_contents.h"
 #include "chrome/browser/profiles/profile_io_data.h"
@@ skipping 80 matching lines @@
   unsafe_resource.original_url = request_->original_url();
   unsafe_resource.redirect_urls = redirect_urls_;
   unsafe_resource.is_subresource = is_subresource_;
   unsafe_resource.is_subframe = is_subframe_;
   unsafe_resource.threat_type = threat_type;
   unsafe_resource.callback = base::Bind(
       &DataReductionProxyResourceThrottle::OnBlockingPageComplete, AsWeakPtr());
   unsafe_resource.callback_thread =
       content::BrowserThread::GetTaskRunnerForThread(
           content::BrowserThread::IO);
-  unsafe_resource.render_process_host_id = info->GetChildID();
-  unsafe_resource.render_frame_id = info->GetRenderFrameID();
+  unsafe_resource.web_contents_getter = info->GetWebContentsGetterForRequest();
   unsafe_resource.threat_source = safe_browsing::ThreatSource::DATA_SAVER;
 
   *defer = true;
 
   content::BrowserThread::PostTask(
       content::BrowserThread::UI, FROM_HERE,
       base::Bind(
           &DataReductionProxyResourceThrottle::StartDisplayingBlockingPage,
-          AsWeakPtr(), safe_browsing_->ui_manager(), unsafe_resource));
+          AsWeakPtr(), safe_browsing_->ui_manager(), unsafe_resource,
+          info->GetChildID(), info->GetRenderFrameID()));
 }
 
 const char* DataReductionProxyResourceThrottle::GetNameForLogging() const {
     return "DataReductionProxyResourceThrottle";
 }
 
 // static
 void DataReductionProxyResourceThrottle::StartDisplayingBlockingPage(
     const base::WeakPtr<DataReductionProxyResourceThrottle>& throttle,
     scoped_refptr<SafeBrowsingUIManager> ui_manager,
-    const SafeBrowsingUIManager::UnsafeResource& resource) {
+    const SafeBrowsingUIManager::UnsafeResource& resource,
+    int child_id,
+    int render_frame_id) {

[jam, 2016/08/15 19:49:10]

ditto

[scottmg, 2016/08/15 19:57:18]

Done.

   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
-  content::RenderFrameHost* rfh = content::RenderFrameHost::FromID(
-      resource.render_process_host_id, resource.render_frame_id);
+  content::RenderFrameHost* rfh =
+      content::RenderFrameHost::FromID(child_id, render_frame_id);
   if (rfh) {
-    content::WebContents* web_contents =
-        content::WebContents::FromRenderFrameHost(rfh);
+    content::WebContents* web_contents = resource.web_contents_getter.Run();
     prerender::PrerenderContents* prerender_contents =
         prerender::PrerenderContents::FromWebContents(web_contents);
     if (prerender_contents) {
       prerender_contents->Destroy(prerender::FINAL_STATUS_SAFE_BROWSING);
-      content::BrowserThread::PostTask(
-          content::BrowserThread::IO,
-          FROM_HERE,
-          base::Bind(resource.callback, false));
+      content::BrowserThread::PostTask(content::BrowserThread::IO, FROM_HERE,
+                                       base::Bind(resource.callback, false));
       return;
     }
   }
   ui_manager->DisplayBlockingPage(resource);
 }
 
 // SafeBrowsingService::UrlCheckCallback implementation, called on the IO
 // thread when the user has decided to proceed with the current request, or
 // go back.
 void DataReductionProxyResourceThrottle::OnBlockingPageComplete(bool proceed) {
@@ skipping 29 matching lines @@
   return result;
 }
 
 void DataReductionProxyResourceThrottle::ResumeRequest() {
   CHECK(state_ == STATE_NONE);
 
   // Inject the header before resuming the request.
   request_->SetExtraRequestHeaderByName(kUnsafeUrlProceedHeader, "1", true);
   controller()->Resume();
 }