Update resource requests to remove redundant frame ID.

content/browser/loader/cross_site_resource_handler.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 "content/browser/loader/cross_site_resource_handler.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 25 matching lines @@
 // The parameters to OnCrossSiteResponseHelper exceed the number of arguments
 // base::Bind supports.
 struct CrossSiteResponseParams {
   CrossSiteResponseParams(
       int render_view_id,
       const GlobalRequestID& global_request_id,
       bool is_transfer,
       const std::vector<GURL>& transfer_url_chain,
       const Referrer& referrer,
       PageTransition page_transition,
-      int64 frame_id,
+      int render_frame_id,
       bool should_replace_current_entry)
       : render_view_id(render_view_id),
         global_request_id(global_request_id),
         is_transfer(is_transfer),
         transfer_url_chain(transfer_url_chain),
         referrer(referrer),
         page_transition(page_transition),
-        frame_id(frame_id),
+        render_frame_id(render_frame_id),
         should_replace_current_entry(should_replace_current_entry) {
   }
 
   int render_view_id;
   GlobalRequestID global_request_id;
   bool is_transfer;
   std::vector<GURL> transfer_url_chain;
   Referrer referrer;
   PageTransition page_transition;
-  int64 frame_id;
+  int render_frame_id;
   bool should_replace_current_entry;
 };
 
 void OnCrossSiteResponseHelper(const CrossSiteResponseParams& params) {
   scoped_ptr<CrossSiteTransferringRequest> cross_site_transferring_request;
   if (params.is_transfer) {
     cross_site_transferring_request.reset(new CrossSiteTransferringRequest(
         params.global_request_id));
   }
 
   RenderViewHostImpl* rvh =
       RenderViewHostImpl::FromID(params.global_request_id.child_id,
                                  params.render_view_id);
   if (rvh) {
     rvh->OnCrossSiteResponse(
         params.global_request_id, cross_site_transferring_request.Pass(),
         params.transfer_url_chain, params.referrer,
-        params.page_transition, params.frame_id,
+        params.page_transition, params.render_frame_id,
         params.should_replace_current_entry);
   } else if (leak_requests_for_testing_ && cross_site_transferring_request) {
     // Some unit tests expect requests to be leaked in this case, so they can
     // pass them along manually.
     cross_site_transferring_request->ReleaseRequest();
   }
 }
 
 }  // namespace
 
@@ skipping 207 matching lines @@
   GlobalRequestID global_id(info->GetChildID(), info->GetRequestID());
 
   // Tell the contents responsible for this request that a cross-site response
   // is starting, so that it can tell its old renderer to run its onunload
   // handler now.  We will wait until the unload is finished and (if a transfer
   // is needed) for the new renderer's request to arrive.
   // The |transfer_url_chain| contains any redirect URLs that have already
   // occurred, plus the destination URL at the end.
   std::vector<GURL> transfer_url_chain;
   Referrer referrer;
-  int frame_id = -1;
+  int render_frame_id = -1;
   if (should_transfer) {
     transfer_url_chain = request()->url_chain();
     referrer = Referrer(GURL(request()->referrer()), info->GetReferrerPolicy());
-    frame_id = info->GetFrameID();
+    render_frame_id = info->GetRenderFrameID();
 
     appcache::AppCacheInterceptor::PrepareForCrossSiteTransfer(
         request(), global_id.child_id);
     ResourceDispatcherHostImpl::Get()->MarkAsTransferredNavigation(global_id);
   }
   BrowserThread::PostTask(
       BrowserThread::UI,
       FROM_HERE,
       base::Bind(
           &OnCrossSiteResponseHelper,
           CrossSiteResponseParams(info->GetRouteID(),
                                   global_id,
                                   should_transfer,
                                   transfer_url_chain,
                                   referrer,
                                   info->GetPageTransition(),
-                                  frame_id,
+                                  render_frame_id,
                                   info->should_replace_current_entry())));
 }
 
 void CrossSiteResourceHandler::ResumeIfDeferred() {
   if (did_defer_) {
     request()->LogUnblocked();
     did_defer_ = false;
     controller()->Resume();
   }
 }
 
 void CrossSiteResourceHandler::OnDidDefer() {
   did_defer_ = true;
   request()->LogBlockedBy("CrossSiteResourceHandler");
 }
 
 }  // namespace content