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

chrome/browser/renderer_host/render_view_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.
 
 #include "chrome/browser/renderer_host/render_view_host.h"
 
 #include <string>
 #include <utility>
 #include <vector>
 
@@ skipping 128 matching lines @@
   // Be sure to clean up any leftover state from cross-site requests.
   Singleton<CrossSiteRequestManager>()->SetHasPendingCrossSiteRequest(
       process()->id(), routing_id(), false);
 
   NotificationService::current()->Notify(
       NotificationType::EXTENSION_PORT_DELETED_DEBUG,
       Source<IPC::Message::Sender>(this),
       NotificationService::NoDetails());
 }
 
-bool RenderViewHost::CreateRenderView(
-    URLRequestContextGetter* request_context, const string16& frame_name) {
+bool RenderViewHost::CreateRenderView(const string16& frame_name) {
   DCHECK(!IsRenderViewLive()) << "Creating view twice";
 
   // The process may (if we're sharing a process with another host that already
   // initialized it) or may not (we have our own process or the old process
   // crashed) have been initialized. Calling Init multiple times will be
   // ignored, so this is safe.
-  if (!process()->Init(is_extension_process_, request_context))
+  if (!process()->Init(is_extension_process_))
     return false;
   DCHECK(process()->HasConnection());
   DCHECK(process()->profile());
 
   if (BindingsPolicy::is_dom_ui_enabled(enabled_bindings_)) {
     ChildProcessSecurityPolicy::GetInstance()->GrantDOMUIBindings(
         process()->id());
   }
 
   if (BindingsPolicy::is_extension_enabled(enabled_bindings_)) {
@@ skipping 1806 matching lines @@
       delegate_->GetContentSettingsDelegate();
   if (content_settings_delegate)
     content_settings_delegate->OnWebDatabaseAccessed(
         url, name, display_name, estimated_size, blocked_by_policy);
 }
 
 void RenderViewHost::OnSetDisplayingPDFContent() {
   delegate_->SetDisplayingPDFContent();
 }