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

chrome/browser/renderer_host/browser_render_process_host.cc

 // Copyright (c) 2010 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.
 
 // Represents the browser side of the browser <--> renderer communication
 // channel. There will be one RenderProcessHost per renderer process.
 
 #include "chrome/browser/renderer_host/browser_render_process_host.h"
 
 #include <algorithm>
@@ skipping 229 matching lines @@
     audio_renderer_host_->Destroy();
 
   ClearTransportDIBCache();
 
   NotificationService::current()->Notify(
       NotificationType::EXTENSION_PORT_DELETED_DEBUG,
       Source<IPC::Message::Sender>(this),
       NotificationService::NoDetails());
 }
 
-bool BrowserRenderProcessHost::Init(bool is_extensions_process,
-                                    URLRequestContextGetter* request_context) {
+bool BrowserRenderProcessHost::Init(bool is_extensions_process) {
   // calling Init() more than once does nothing, this makes it more convenient
   // for the view host which may not be sure in some cases
   if (channel_.get())
     return true;
 
   // It is possible for an extension process to be reused for non-extension
   // content, e.g. if an extension calls window.open.
   extension_process_ = extension_process_ || is_extensions_process;
 
   // run the IPC channel on the shared IO thread.
   base::Thread* io_thread = g_browser_process->io_thread();
 
   // Construct the AudioRendererHost with the IO thread.
   audio_renderer_host_ = new AudioRendererHost();
 
   scoped_refptr<ResourceMessageFilter> resource_message_filter =
       new ResourceMessageFilter(g_browser_process->resource_dispatcher_host(),
                                 id(),
                                 audio_renderer_host_.get(),
                                 PluginService::GetInstance(),
                                 g_browser_process->print_job_manager(),
                                 profile(),
-                                widget_helper_,
-                                request_context);
+                                widget_helper_);
 
   std::wstring renderer_prefix;
 #if defined(OS_POSIX)
   // A command prefix is something prepended to the command line of the spawned
   // process. It is supported only on POSIX systems.
   const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess();
   renderer_prefix =
       browser_command_line.GetSwitchValue(switches::kRendererCmdPrefix);
 #endif  // defined(OS_POSIX)
 
@@ skipping 785 matching lines @@
         IPC::InvalidPlatformFileForTransit(),
         std::vector<std::string>(),
         std::string(),
         false));
   }
 }
 
 void BrowserRenderProcessHost::EnableAutoSpellCorrect(bool enable) {
   Send(new ViewMsg_SpellChecker_EnableAutoSpellCorrect(enable));
 }