Remove child/route parameters from ShouldBeginRequest and RequestBeginning.

content/browser/transition_browsertest.cc

 // Copyright 2014 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 "base/bind.h"
 #include "base/command_line.h"
 #include "content/browser/loader/cross_site_resource_handler.h"
 #include "content/browser/loader/resource_dispatcher_host_impl.h"
 #include "content/browser/loader/resource_request_info_impl.h"
 #include "content/browser/transition_request_manager.h"
@@ skipping 33 matching lines @@
         request_(NULL),
         did_defer_response_(false),
         is_transition_request_(false) {
   }
 
   virtual void RequestBeginning(
       net::URLRequest* request,
       ResourceContext* resource_context,
       AppCacheService* appcache_service,
       ResourceType resource_type,
-      int child_id,
-      int route_id,
       ScopedVector<ResourceThrottle>* throttles) OVERRIDE {
     CHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
     ShellResourceDispatcherHostDelegate::RequestBeginning(request,
                                                           resource_context,
                                                           appcache_service,
                                                           resource_type,
-                                                          child_id,
-                                                          route_id,
                                                           throttles);
     request_ = request;
 
     ResourceRequestInfoImpl* info =
         ResourceRequestInfoImpl::ForRequest(request_);
 
     if (is_transition_request_) {
       TransitionRequestManager::GetInstance()->AddPendingTransitionRequestData(
-          child_id, info->GetRenderFrameID(), "*", "", "");
+          info->GetChildID(), info->GetRenderFrameID(), "*", "", "");
     }
   }
 
   virtual void OnResponseStarted(
       net::URLRequest* request,
       ResourceContext* resource_context,
       ResourceResponse* response,
       IPC::Sender* sender) OVERRIDE {
     ResourceRequestInfoImpl* info =
         ResourceRequestInfoImpl::ForRequest(request_);
@@ skipping 66 matching lines @@
 
   WaitForLoadStop(transition_web_contents.get());
 
   int transition_process_id =
       transition_web_contents->GetRenderProcessHost()->GetID();
 
   EXPECT_EQ(outgoing_process_id, transition_process_id);
 }
 
 }  // namespace content