Merge 54867 - ChromeFrame currently overrides the request context for interce...

chrome/browser/renderer_host/mock_render_process_host.cc

 // Copyright (c) 2009 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/mock_render_process_host.h"
 
 #include "chrome/browser/child_process_security_policy.h"
 
 MockRenderProcessHost::MockRenderProcessHost(Profile* profile)
     : RenderProcessHost(profile),
       transport_dib_(NULL),
       bad_msg_count_(0) {
   // Child process security operations can't be unit tested unless we add
   // ourselves as an existing child process.
   ChildProcessSecurityPolicy::GetInstance()->Add(id());
 }
 
 MockRenderProcessHost::~MockRenderProcessHost() {
   ChildProcessSecurityPolicy::GetInstance()->Remove(id());
   delete transport_dib_;
 }
 
-bool MockRenderProcessHost::Init(bool is_extensions_process,
-                                 URLRequestContextGetter* request_context) {
+bool MockRenderProcessHost::Init(bool is_extensions_process) {
   return true;
 }
 
 int MockRenderProcessHost::GetNextRoutingID() {
   static int prev_routing_id = 0;
   return ++prev_routing_id;
 }
 
 void MockRenderProcessHost::CancelResourceRequests(int render_widget_id) {
 }
@@ skipping 73 matching lines @@
 #endif
 
   return transport_dib_;
 }
 
 void MockRenderProcessHost::OnMessageReceived(const IPC::Message& msg) {
 }
 
 void MockRenderProcessHost::OnChannelConnected(int32 peer_pid) {
 }