Remove VisitedLink dependency on rest of chrome

chrome/browser/visitedlink/visitedlink_unittest.cc

Index: chrome/browser/visitedlink/visitedlink_unittest.cc
diff --git a/chrome/browser/visitedlink/visitedlink_unittest.cc b/chrome/browser/visitedlink/visitedlink_unittest.cc
index d13e988b4cd7518aa8f1ee9aa7830524a9cc1ba1..d9139f20875e2971b616f699a82c65125d3d3e9b 100644
--- a/chrome/browser/visitedlink/visitedlink_unittest.cc
+++ b/chrome/browser/visitedlink/visitedlink_unittest.cc
@@ -13,9 +13,9 @@
 #include "base/shared_memory.h"
 #include "base/string_util.h"
 #include "base/time.h"
+#include "chrome/browser/visitedlink/visitedlink_delegate.h"
 #include "chrome/browser/visitedlink/visitedlink_event_listener.h"
 #include "chrome/browser/visitedlink/visitedlink_master.h"
-#include "chrome/browser/visitedlink/visitedlink_master_factory.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/renderer/visitedlink_slave.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
@@ -44,12 +44,6 @@ GURL TestURL(int i) {
   return GURL(StringPrintf("%s%d", g_test_prefix, i));
 }
 
-ProfileKeyedService* BuildVisitedLinkMaster(Profile* profile) {
-  VisitedLinkMaster* master = new VisitedLinkMaster(profile);
-  master->Init();
-  return master;
-}
-
 std::vector<VisitedLinkSlave*> g_slaves;
 
 }  // namespace
@@ -559,6 +553,23 @@ class VisitedLinkRenderProcessHostFactory
   DISALLOW_COPY_AND_ASSIGN(VisitedLinkRenderProcessHostFactory);
 };
 
+class TestVisitedLinkDelegate : public VisitedLinkDelegate {
+ public:
+  virtual bool IsEquivalentContext(content::BrowserContext* context1,
+                                   content::BrowserContext* context2) OVERRIDE;
+  virtual void RebuildTable(URLEnumerator* enumerator) OVERRIDE;
+};
+
+bool TestVisitedLinkDelegate::IsEquivalentContext(
+    content::BrowserContext* context1, content::BrowserContext* context2) {
+  DCHECK_EQ(context1, context2);
+  return true;  // Test only has one profile.
+}
+
+void TestVisitedLinkDelegate::RebuildTable(URLEnumerator* enumerator) {
+  enumerator->OnComplete(true);
+}
+
 class VisitedLinkEventsTest : public ChromeRenderViewHostTestHarness {
  public:
   VisitedLinkEventsTest()
@@ -568,9 +579,8 @@ class VisitedLinkEventsTest : public ChromeRenderViewHostTestHarness {
   virtual void SetUp() {
     browser_context_.reset(new VisitCountingProfile());
     profile()->CreateHistoryService(true, false);
-    master_ = static_cast<VisitedLinkMaster*>(
-        VisitedLinkMasterFactory::GetInstance()->
-            SetTestingFactoryAndUse(profile(), BuildVisitedLinkMaster));
+    master_.reset(new VisitedLinkMaster(profile(), &delegate_));
+    master_->Init();
     SetRenderProcessHostFactory(&vc_rph_factory_);
     ChromeRenderViewHostTestHarness::SetUp();
   }
@@ -580,7 +590,7 @@ class VisitedLinkEventsTest : public ChromeRenderViewHostTestHarness {
   }
 
   VisitedLinkMaster* master() const {
-    return master_;
+    return master_.get();
   }
 
   void WaitForCoalescense() {
@@ -596,7 +606,8 @@ class VisitedLinkEventsTest : public ChromeRenderViewHostTestHarness {
   VisitedLinkRenderProcessHostFactory vc_rph_factory_;
 
  private:
-  VisitedLinkMaster* master_;
+  TestVisitedLinkDelegate delegate_;
+  scoped_ptr<VisitedLinkMaster> master_;
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread file_thread_;