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

chrome/browser/visitedlink/visitedlink_unittest.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 <vector>
 #include <string>
 #include <cstdio>
 
 #include "base/message_loop.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/shared_memory.h"
 #include "base/string_util.h"
 #include "chrome/browser/visitedlink/visitedlink_master.h"
 #include "chrome/browser/visitedlink/visitedlink_event_listener.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/renderer/visitedlink_slave.h"
+#include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/renderer_host/browser_render_process_host.h"
-#include "content/browser/renderer_host/test_render_view_host.h"
 #include "content/common/notification_service.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 // a nice long URL that we can append numbers to to get new URLs
 const char g_test_prefix[] =
   "http://www.google.com/products/foo/index.html?id=45028640526508376&seq=";
 const int g_test_count = 1000;
@@ skipping 523 matching lines @@
   virtual RenderProcessHost* CreateRenderProcessHost(
       content::BrowserContext* browser_context) const OVERRIDE {
     return new VisitRelayingRenderProcessHost(browser_context);
   }
 
  private:
 
   DISALLOW_COPY_AND_ASSIGN(VisitedLinkRenderProcessHostFactory);
 };
 
-class VisitedLinkEventsTest : public RenderViewHostTestHarness {
+class VisitedLinkEventsTest : public ChromeRenderViewHostTestHarness {
  public:
   VisitedLinkEventsTest()
-      : RenderViewHostTestHarness(),
+      : ChromeRenderViewHostTestHarness(),
         ui_thread_(BrowserThread::UI, &message_loop_),
         file_thread_(BrowserThread::FILE, &message_loop_) {}
-  ~VisitedLinkEventsTest() {
-    // This ends up using the file thread to schedule the delete.
-    profile_.reset();
-    message_loop_.RunAllPending();
-  }
+  virtual ~VisitedLinkEventsTest() {}
   virtual void SetFactoryMode() {}
   virtual void SetUp() {
     SetFactoryMode();
     event_listener_.reset(new VisitedLinkEventListener());
     rvh_factory_.set_render_process_host_factory(&vc_rph_factory_);
-    profile_.reset(new VisitCountingProfile(event_listener_.get()));
-    RenderViewHostTestHarness::SetUp();
+    browser_context_.reset(new VisitCountingProfile(event_listener_.get()));
+    ChromeRenderViewHostTestHarness::SetUp();
   }
 
   VisitCountingProfile* profile() const {
-    return static_cast<VisitCountingProfile*>(profile_.get());
+    return static_cast<VisitCountingProfile*>(browser_context_.get());
   }
 
   void WaitForCoalescense() {
     // Let the timer fire.
     MessageLoop::current()->PostDelayedTask(FROM_HERE,
                                             new MessageLoop::QuitTask(), 110);
     MessageLoop::current()->Run();
   }
 
  protected:
   VisitedLinkRenderProcessHostFactory vc_rph_factory_;
 
  private:
   scoped_ptr<VisitedLinkEventListener> event_listener_;
   BrowserThread ui_thread_;
   BrowserThread file_thread_;
 
   DISALLOW_COPY_AND_ASSIGN(VisitedLinkEventsTest);
 };
 
 TEST_F(VisitedLinkEventsTest, Coalescense) {
   // add some URLs to master.
-  VisitedLinkMaster* master = profile_->GetVisitedLinkMaster();
+  VisitedLinkMaster* master = profile()->GetVisitedLinkMaster();
   // Add a few URLs.
   master->AddURL(GURL("http://acidtests.org/"));
   master->AddURL(GURL("http://google.com/"));
   master->AddURL(GURL("http://chromium.org/"));
   // Just for kicks, add a duplicate URL. This shouldn't increase the resulting
   master->AddURL(GURL("http://acidtests.org/"));
 
   // Make sure that coalescing actually occurs. There should be no links or
   // events received by the renderer.
   EXPECT_EQ(0, profile()->add_count());
@@ skipping 31 matching lines @@
 
   WaitForCoalescense();
 
   // We should have no change in results except for one new reset event.
   EXPECT_EQ(6, profile()->add_count());
   EXPECT_EQ(2, profile()->add_event_count());
   EXPECT_EQ(1, profile()->reset_event_count());
 }
 
 TEST_F(VisitedLinkEventsTest, Basics) {
-  VisitedLinkMaster* master = profile_->GetVisitedLinkMaster();
+  VisitedLinkMaster* master = profile()->GetVisitedLinkMaster();
   rvh()->CreateRenderView(string16());
 
   // Add a few URLs.
   master->AddURL(GURL("http://acidtests.org/"));
   master->AddURL(GURL("http://google.com/"));
   master->AddURL(GURL("http://chromium.org/"));
 
   WaitForCoalescense();
 
   // We now should have 1 add event.
   EXPECT_EQ(1, profile()->add_event_count());
   EXPECT_EQ(0, profile()->reset_event_count());
 
   master->DeleteAllURLs();
 
   WaitForCoalescense();
 
   // We should have no change in add results, plus one new reset event.
   EXPECT_EQ(1, profile()->add_event_count());
   EXPECT_EQ(1, profile()->reset_event_count());
 }
 
 TEST_F(VisitedLinkEventsTest, TabVisibility) {
-  VisitedLinkMaster* master = profile_->GetVisitedLinkMaster();
+  VisitedLinkMaster* master = profile()->GetVisitedLinkMaster();
   rvh()->CreateRenderView(string16());
 
   // Simulate tab becoming inactive.
   rvh()->WasHidden();
 
   // Add a few URLs.
   master->AddURL(GURL("http://acidtests.org/"));
   master->AddURL(GURL("http://google.com/"));
   master->AddURL(GURL("http://chromium.org/"));
 
@@ skipping 23 matching lines @@
   EXPECT_EQ(1, profile()->add_event_count());
   EXPECT_EQ(0, profile()->reset_event_count());
 
   // Activate the tab.
   rvh()->WasRestored();
 
   // We should have only one more reset event.
   EXPECT_EQ(1, profile()->add_event_count());
   EXPECT_EQ(1, profile()->reset_event_count());
 }