Clean up ShortcutsProvider and related classes.

chrome/browser/autocomplete/shortcuts_provider_unittest.cc

Index: chrome/browser/autocomplete/shortcuts_provider_unittest.cc
===================================================================
--- chrome/browser/autocomplete/shortcuts_provider_unittest.cc	(revision 126477)
+++ chrome/browser/autocomplete/shortcuts_provider_unittest.cc	(working copy)
@@ -28,9 +28,6 @@
 #include "content/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-using base::Time;
-using base::TimeDelta;
-
 using content::BrowserThread;
 
 namespace {
@@ -145,7 +142,7 @@
   void TearDown();
 
   // Fills test data into the provider.
-  void FillData();
+  void FillData(TestShortcutInfo* db, size_t db_size);
 
   // Runs an autocomplete query on |text| and checks to see that the returned
   // results' destination URLs match those provided. |expected_urls| does not
@@ -181,31 +178,24 @@
   mock_backend_ = new history::ShortcutsBackend(FilePath(), profile_.get());
   mock_backend_->Init();
   provider_->set_shortcuts_backend(mock_backend_.get());
-  FillData();
+  FillData(shortcut_test_db, arraysize(shortcut_test_db));
 }
 
 void ShortcutsProviderTest::TearDown() {
   provider_ = NULL;
 }
 
-void ShortcutsProviderTest::FillData() {
+void ShortcutsProviderTest::FillData(TestShortcutInfo* db, size_t db_size) {
   DCHECK(provider_.get());
-  mock_backend_->DeleteAllShortcuts();
-  for (size_t i = 0; i < arraysize(shortcut_test_db); ++i) {
-    const TestShortcutInfo& cur = shortcut_test_db[i];
-    const GURL current_url(cur.url);
-    Time visit_time = Time::Now() - TimeDelta::FromDays(cur.days_from_now);
-    shortcuts_provider::Shortcut shortcut(
-        ASCIIToUTF16(cur.title),
-        current_url,
-        ASCIIToUTF16(cur.contents),
-        shortcuts_provider::SpansFromString(ASCIIToUTF16(cur.contents_class)),
+  for (size_t i = 0; i < db_size; ++i) {
+    const TestShortcutInfo& cur = db[i];
+    history::ShortcutsBackend::Shortcut shortcut(cur.guid,
+        ASCIIToUTF16(cur.title), GURL(cur.url), ASCIIToUTF16(cur.contents),
+        AutocompleteMatch::ClassificationsFromString(cur.contents_class),
         ASCIIToUTF16(cur.description),
-        shortcuts_provider::SpansFromString(
-            ASCIIToUTF16(cur.description_class)));
-    shortcut.last_access_time = visit_time;
-    shortcut.number_of_hits = cur.typed_count;
-    shortcut.id = cur.guid;
+        AutocompleteMatch::ClassificationsFromString(cur.description_class),
+        base::Time::Now() - base::TimeDelta::FromDays(cur.days_from_now),
+        cur.typed_count);
     mock_backend_->AddShortcut(shortcut);
   }
 }
@@ -565,15 +555,12 @@
       ACMatchClassification(0, ACMatchClassification::NONE));
   spans_description.push_back(
       ACMatchClassification(2, ACMatchClassification::MATCH));
-  shortcuts_provider::Shortcut shortcut(ASCIIToUTF16("test"),
-                                        GURL("http://www.test.com"),
-                                        ASCIIToUTF16("www.test.com"),
-                                        spans_content,
-                                        ASCIIToUTF16("A test"),
-                                        spans_description);
+  history::ShortcutsBackend::Shortcut shortcut(std::string(),
+      ASCIIToUTF16("test"), GURL("http://www.test.com"),
+      ASCIIToUTF16("www.test.com"), spans_content, ASCIIToUTF16("A test"),
+      spans_description, base::Time::Now(), 1);
 
   // Maximal score.
-  shortcut.last_access_time = Time::Now();
   const int kMaxScore = ShortcutsProvider::CalculateScore(
       ASCIIToUTF16("test"), shortcut);
 
@@ -589,20 +576,20 @@
   EXPECT_LT(score_one_quarter, score_one_half);
 
   // Should decay with time - one week.
-  shortcut.last_access_time = Time::Now() - TimeDelta::FromDays(7);
+  shortcut.last_access_time = base::Time::Now() - base::TimeDelta::FromDays(7);
   int score_week_old =
       ShortcutsProvider::CalculateScore(ASCIIToUTF16("test"), shortcut);
   EXPECT_LT(score_week_old, kMaxScore);
 
   // Should decay more in two weeks.
-  shortcut.last_access_time = Time::Now() - TimeDelta::FromDays(14);
+  shortcut.last_access_time = base::Time::Now() - base::TimeDelta::FromDays(14);
   int score_two_weeks_old =
       ShortcutsProvider::CalculateScore(ASCIIToUTF16("test"), shortcut);
   EXPECT_LT(score_two_weeks_old, score_week_old);
 
   // But not if it was activly clicked on. 2 hits slow decaying power.
   shortcut.number_of_hits = 2;
-  shortcut.last_access_time = Time::Now() - TimeDelta::FromDays(14);
+  shortcut.last_access_time = base::Time::Now() - base::TimeDelta::FromDays(14);
   int score_popular_two_weeks_old =
       ShortcutsProvider::CalculateScore(ASCIIToUTF16("test"), shortcut);
   EXPECT_LT(score_two_weeks_old, score_popular_two_weeks_old);
@@ -611,7 +598,7 @@
 
   // 3 hits slow decaying power even more.
   shortcut.number_of_hits = 3;
-  shortcut.last_access_time = Time::Now() - TimeDelta::FromDays(14);
+  shortcut.last_access_time = base::Time::Now() - base::TimeDelta::FromDays(14);
   int score_more_popular_two_weeks_old =
       ShortcutsProvider::CalculateScore(ASCIIToUTF16("test"), shortcut);
   EXPECT_LT(score_two_weeks_old, score_more_popular_two_weeks_old);
@@ -639,22 +626,7 @@
   size_t original_shortcuts_count =
       provider_->shortcuts_backend_->shortcuts_map().size();
 
-  for (size_t i = 0; i < arraysize(shortcuts_to_test_delete); ++i) {
-    const TestShortcutInfo& cur = shortcuts_to_test_delete[i];
-    const GURL current_url(cur.url);
-    Time visit_time = Time::Now() - TimeDelta::FromDays(cur.days_from_now);
-    shortcuts_provider::Shortcut shortcut(
-        ASCIIToUTF16(cur.title),
-        current_url,
-        ASCIIToUTF16(cur.contents),
-        shortcuts_provider::SpansFromString(ASCIIToUTF16(cur.contents_class)),
-        ASCIIToUTF16(cur.description),
-        shortcuts_provider::SpansFromString(
-            ASCIIToUTF16(cur.description_class)));
-    shortcut.last_access_time = visit_time;
-    shortcut.id = cur.guid;
-    mock_backend_->AddShortcut(shortcut);
-  }
+  FillData(shortcuts_to_test_delete, arraysize(shortcuts_to_test_delete));
 
   EXPECT_EQ(original_shortcuts_count + 3,
             provider_->shortcuts_backend_->shortcuts_map().size());