Make PrerenderTracker's resource_throttle_io_thread_map_ use RenderFrame IDs instead of RenderView …

chrome/browser/prerender/prerender_resource_throttle.cc

 // Copyright 2013 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/prerender/prerender_resource_throttle.h"
 
 #include "chrome/browser/prerender/prerender_final_status.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/prerender/prerender_tracker.h"
 #include "chrome/browser/prerender/prerender_util.h"
@@ skipping 21 matching lines @@
 PrerenderResourceThrottle::PrerenderResourceThrottle(
     net::URLRequest* request,
     PrerenderTracker* tracker)
     : request_(request),
       tracker_(tracker) {
 }
 
 void PrerenderResourceThrottle::WillStartRequest(bool* defer) {
   const content::ResourceRequestInfo* info =
       content::ResourceRequestInfo::ForRequest(request_);
-  int child_id = info->GetChildID();
-  int route_id = info->GetRouteID();
-
-  // If the prerender was used since the throttle was added, leave it
-  // alone.
-  if (!tracker_->IsPrerenderingOnIOThread(child_id, route_id))
-    return;
-
   *defer = true;
   content::BrowserThread::PostTask(
       content::BrowserThread::UI,
       FROM_HERE,
       base::Bind(&PrerenderResourceThrottle::WillStartRequestOnUI,
                  AsWeakPtr(), request_->method(), info->GetChildID(),
                  info->GetRenderFrameID(), request_->url()));
 }
 
 void PrerenderResourceThrottle::WillRedirectRequest(const GURL& new_url,
                                                     bool* defer) {
   const content::ResourceRequestInfo* info =
       content::ResourceRequestInfo::ForRequest(request_);
-  int child_id = info->GetChildID();
-  int route_id = info->GetRouteID();
-
-  // If the prerender was used since the throttle was added, leave it
-  // alone.
-  if (!tracker_->IsPrerenderingOnIOThread(child_id, route_id))
-    return;
-
   *defer = true;
   std::string header;
   request_->GetResponseHeaderByName(kFollowOnlyWhenPrerenderShown, &header);
 
   content::BrowserThread::PostTask(
       content::BrowserThread::UI,
       FROM_HERE,
       base::Bind(&PrerenderResourceThrottle::WillRedirectRequestOnUI,
                  AsWeakPtr(), header, info->GetResourceType(), info->IsAsync(),
                  info->GetChildID(), info->GetRenderFrameID(), new_url));
@@ skipping 97 matching lines @@
       render_process_id, render_frame_id);
   content::WebContents* web_contents =
       content::WebContents::FromRenderFrameHost(rfh);
   return PrerenderContents::FromWebContents(web_contents);
 }
 
 void PrerenderResourceThrottle::AddResourceThrottle() {
   const content::ResourceRequestInfo* info =
       content::ResourceRequestInfo::ForRequest(request_);
   int child_id = info->GetChildID();
   int route_id = info->GetRouteID();

[tburkard, 2014/01/17 11:26:11]

So you said transition to RenderFrameID vs. RenderViewID.

But here, when adding the resource to the throttle, it seems like the
RenderViewID is still used to add it?

Did you intend to change this to GetRenderFrameID()?

   tracker_->AddResourceThrottleOnIOThread(child_id, route_id, AsWeakPtr());
 }
 
 }  // namespace prerender