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

chrome/browser/tab_contents/tab_contents.cc

Index: chrome/browser/tab_contents/tab_contents.cc
===================================================================
--- chrome/browser/tab_contents/tab_contents.cc	(revision 56788)
+++ chrome/browser/tab_contents/tab_contents.cc	(working copy)
@@ -1355,10 +1355,6 @@
     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.
@@ -2966,11 +2962,7 @@
     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.