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

chrome/browser/tab_contents/web_contents_unittest.cc

Index: chrome/browser/tab_contents/web_contents_unittest.cc
diff --git a/chrome/browser/tab_contents/web_contents_unittest.cc b/chrome/browser/tab_contents/web_contents_unittest.cc
index 613a18c934e734de6512feb41eea4b4043e6d1ca..e7c7dd3199556ff7226cd68ea3a24b65c1268ced 100644
--- a/chrome/browser/tab_contents/web_contents_unittest.cc
+++ b/chrome/browser/tab_contents/web_contents_unittest.cc
@@ -11,12 +11,12 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
+#include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_pref_service.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
-#include "content/browser/renderer_host/test_render_view_host.h"
 #include "content/browser/site_instance.h"
 #include "content/browser/tab_contents/constrained_window.h"
 #include "content/browser/tab_contents/navigation_details.h"
@@ -169,10 +169,10 @@ class TestInterstitialPageStateGuard : public TestInterstitialPage::Delegate {
   TestInterstitialPage* interstitial_page_;
 };
 
-class TabContentsTest : public RenderViewHostTestHarness {
+class TabContentsTest : public ChromeRenderViewHostTestHarness {
  public:
   TabContentsTest()
-      : RenderViewHostTestHarness(),
+      : ChromeRenderViewHostTestHarness(),
         ui_thread_(BrowserThread::UI, &message_loop_) {
   }
 
@@ -181,7 +181,7 @@ class TabContentsTest : public RenderViewHostTestHarness {
   // is not supposed to overwrite a profile if it's already created.
   virtual void SetUp() {
     TestingProfile* profile = new TestingProfile();
-    profile_.reset(profile);
+    browser_context_.reset(profile);
 
     // Set some (WebKit) user preferences.
     TestingPrefService* pref_services = profile->GetTestingPrefService();
@@ -200,13 +200,7 @@ class TabContentsTest : public RenderViewHostTestHarness {
     pref_services->SetUserPref("webkit.webprefs.foo",
                                Value::CreateStringValue("bar"));
 
-    RenderViewHostTestHarness::SetUp();
-  }
-
-  virtual void TearDown() {
-    RenderViewHostTestHarness::TearDown();
-
-    profile_.reset(NULL);
+    ChromeRenderViewHostTestHarness::SetUp();
   }
 
   BrowserThread ui_thread_;