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

chrome/browser/tab_contents/tab_contents.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/tab_contents/tab_contents.h"
 
 #if defined(OS_CHROMEOS)
 // For GdkScreen
 #include <gdk/gdk.h>
 #endif  // defined(OS_CHROMEOS)
@@ skipping 1337 matching lines @@
       NotificationType::METRIC_EVENT_DURATION,
       Source<TabContents>(this),
       Details<MetricEventDurationDetails>(&details));
 }
 
 void TabContents::OnCloseStarted() {
   if (tab_close_start_time_.is_null())
     tab_close_start_time_ = base::TimeTicks::Now();
 }
 
-void TabContents::set_request_context(URLRequestContextGetter* context) {
-  request_context_ = context;
-}
-
 bool TabContents::ShouldAcceptDragAndDrop() const {
 #if defined(OS_CHROMEOS)
   // ChromeOS panels (pop-ups) do not take drag-n-drop.
   // See http://crosbug.com/2413
   return delegate() && !delegate()->IsPopup(const_cast<TabContents*>(this));
 #else
   return true;
 #endif
 }
 
@@ skipping 1587 matching lines @@
 
 NavigationEntry*
 TabContents::GetLastCommittedNavigationEntryForRenderManager() {
   return controller_.GetLastCommittedEntry();
 }
 
 bool TabContents::CreateRenderViewForRenderManager(
     RenderViewHost* render_view_host) {
   RenderWidgetHostView* rwh_view = view_->CreateViewForWidget(render_view_host);
 
-  scoped_refptr<URLRequestContextGetter> request_context = request_context_;
-  if (!request_context.get())
-    request_context = profile()->GetRequestContext();
-
-  if (!render_view_host->CreateRenderView(request_context, string16()))
+  if (!render_view_host->CreateRenderView(string16()))
     return false;
 
   // Now that the RenderView has been created, we need to tell it its size.
   rwh_view->SetSize(view_->GetContainerSize());
 
   UpdateMaxPageIDIfNecessary(render_view_host->site_instance(),
                              render_view_host);
   return true;
 }
 
@@ skipping 271 matching lines @@
   AddInfoBar(new SavePasswordInfoBarDelegate(this, form_to_save));
 }
 
 Profile* TabContents::GetProfileForPasswordManager() {
   return profile();
 }
 
 bool TabContents::DidLastPageLoadEncounterSSLErrors() {
   return controller().ssl_manager()->ProcessedSSLErrorFromRequest();
 }