Add ChromeRenderViewHostTestHarness to get rid of the dependency from RVHTH to profile

content/browser/renderer_host/test_render_view_host.cc

 // Copyright (c) 2011 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/test/base/testing_profile.h"
 #include "content/browser/browser_url_handler.h"
 #include "content/browser/renderer_host/test_backing_store.h"
 #include "content/browser/renderer_host/test_render_view_host.h"
 #include "content/browser/site_instance.h"
 #include "content/browser/tab_contents/navigation_controller.h"
 #include "content/browser/tab_contents/test_tab_contents.h"
 #include "content/common/content_client.h"
 #include "content/common/dom_storage_common.h"
 #include "content/common/view_messages.h"
+#include "content/test/test_browser_context.h"
 #include "ui/gfx/rect.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webpreferences.h"
 #include "webkit/glue/password_form.h"
 
 using webkit_glue::PasswordForm;
 
 void InitNavigateParams(ViewHostMsg_FrameNavigate_Params* params,
                         int page_id,
                         const GURL& url,
@@ skipping 275 matching lines @@
 
 TestRenderViewHost* RenderViewHostTestHarness::pending_rvh() {
   return static_cast<TestRenderViewHost*>(
       contents()->render_manager()->pending_render_view_host());
 }
 
 TestRenderViewHost* RenderViewHostTestHarness::active_rvh() {
   return pending_rvh() ? pending_rvh() : rvh();
 }
 
-TestingProfile* RenderViewHostTestHarness::profile() {
-  return profile_.get();
+content::BrowserContext* RenderViewHostTestHarness::browser_context() {
+  return browser_context_.get();
 }
 
 MockRenderProcessHost* RenderViewHostTestHarness::process() {
   if (pending_rvh())
     return static_cast<MockRenderProcessHost*>(pending_rvh()->process());
   return static_cast<MockRenderProcessHost*>(rvh()->process());
 }
 
 void RenderViewHostTestHarness::DeleteContents() {
   SetContents(NULL);
 }
 
 void RenderViewHostTestHarness::SetContents(TestTabContents* contents) {
   contents_.reset(contents);
 }
 
 TestTabContents* RenderViewHostTestHarness::CreateTestTabContents() {
-  // See comment above profile_ decl for why we check for NULL here.
-  if (!profile_.get())
-    profile_.reset(new TestingProfile());
+  // See comment above browser_context_ decl for why we check for NULL here.
+  if (!browser_context_.get())
+    browser_context_.reset(new TestBrowserContext());
 
   // This will be deleted when the TabContents goes away.
-  SiteInstance* instance = SiteInstance::CreateSiteInstance(profile_.get());
+  SiteInstance* instance =
+      SiteInstance::CreateSiteInstance(browser_context_.get());
 
-  return new TestTabContents(profile_.get(), instance);
+  return new TestTabContents(browser_context_.get(), instance);
 }
 
 void RenderViewHostTestHarness::NavigateAndCommit(const GURL& url) {
   contents()->NavigateAndCommit(url);
 }
 
 void RenderViewHostTestHarness::Reload() {
   NavigationEntry* entry = controller().GetLastCommittedEntry();
   DCHECK(entry);
   controller().Reload(false);
   rvh()->SendNavigate(entry->page_id(), entry->url());
 }
 
 void RenderViewHostTestHarness::SetUp() {
   SetContents(CreateTestTabContents());
 }
 
 void RenderViewHostTestHarness::TearDown() {
   SetContents(NULL);
 
   // Make sure that we flush any messages related to TabContents destruction
-  // before we destroy the profile.
+  // before we destroy the browser context.
   MessageLoop::current()->RunAllPending();
 
-  // Release the profile on the UI thread.
-  message_loop_.DeleteSoon(FROM_HERE, profile_.release());
+  // Release the browser context on the UI thread.
+  message_loop_.DeleteSoon(FROM_HERE, browser_context_.release());
   message_loop_.RunAllPending();
 }