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

chrome/browser/renderer_host/test/test_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/test/test_render_view_host.h"
 
 #include "chrome/browser/browser_url_handler.h"
 #include "chrome/browser/renderer_host/test/test_backing_store.h"
 #include "chrome/browser/tab_contents/test_tab_contents.h"
 #include "chrome/common/dom_storage_common.h"
@@ skipping 32 matching lines @@
 }
 
 TestRenderViewHost::~TestRenderViewHost() {
   if (delete_counter_)
     ++*delete_counter_;
 
   // Since this isn't a traditional view, we have to delete it.
   delete view();
 }
 
-bool TestRenderViewHost::CreateRenderView(
-    URLRequestContextGetter* request_context, const string16& frame_name) {
+bool TestRenderViewHost::CreateRenderView(const string16& frame_name) {
   DCHECK(!render_view_created_);
   render_view_created_ = true;
   process()->ViewCreated();
   return true;
 }
 
 bool TestRenderViewHost::IsRenderViewLive() const {
   return render_view_created_;
 }
 
@@ skipping 121 matching lines @@
   contents_.reset();
 
   // Make sure that we flush any messages related to TabContents destruction
   // before we destroy the profile.
   MessageLoop::current()->RunAllPending();
 
   // Release the profile on the UI thread.
   message_loop_.DeleteSoon(FROM_HERE, profile_.release());
   message_loop_.RunAllPending();
 }