Clean up ShortcutsProvider and related classes.

chrome/browser/history/shortcuts_database_unittest.cc

Index: chrome/browser/history/shortcuts_database_unittest.cc
===================================================================
--- chrome/browser/history/shortcuts_database_unittest.cc	(revision 125990)
+++ chrome/browser/history/shortcuts_database_unittest.cc	(working copy)
@@ -8,18 +8,12 @@
 #include "base/stringprintf.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/autocomplete/shortcuts_provider_shortcut.h"
 #include "chrome/browser/history/shortcuts_database.h"
 #include "chrome/common/guid.h"
 #include "sql/statement.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 
-using base::Time;
-using base::TimeDelta;
-using shortcuts_provider::Shortcut;
-using shortcuts_provider::ShortcutMap;
-
 namespace history {
 
 struct ShortcutsDatabaseTestInfo {
@@ -54,7 +48,8 @@
   void ClearDB();
   size_t CountRecords() const;
 
-  Shortcut ShortcutFromTestInfo(const ShortcutsDatabaseTestInfo& info);
+  ShortcutsBackend::Shortcut ShortcutFromTestInfo(
+      const ShortcutsDatabaseTestInfo& info);
 
   void AddAll();
 
@@ -86,18 +81,15 @@
   return static_cast<size_t>(s.ColumnInt(0));
 }
 
-Shortcut ShortcutsDatabaseTest::ShortcutFromTestInfo(
+ShortcutsBackend::Shortcut ShortcutsDatabaseTest::ShortcutFromTestInfo(
     const ShortcutsDatabaseTestInfo& info) {
-  Time visit_time = Time::Now() - TimeDelta::FromDays(info.days_from_now);
-  return Shortcut(info.guid,
-                  ASCIIToUTF16(info.title),
-                  ASCIIToUTF16(info.url),
-                  ASCIIToUTF16(info.contents),
-                  ASCIIToUTF16(info.contents_class),
-                  ASCIIToUTF16(info.description),
-                  ASCIIToUTF16(info.description_class),
-                  visit_time.ToInternalValue(),
-                  info.typed_count);
+  return ShortcutsBackend::Shortcut(info.guid, ASCIIToUTF16(info.title),
+      GURL(info.url), ASCIIToUTF16(info.contents),
+      AutocompleteMatch::ClassificationsFromString(info.contents_class),
+      ASCIIToUTF16(info.description),
+      AutocompleteMatch::ClassificationsFromString(info.description_class),
+      base::Time::Now() - base::TimeDelta::FromDays(info.days_from_now),
+      info.typed_count);
 }
 
 void ShortcutsDatabaseTest::AddAll() {
@@ -121,12 +113,14 @@
 
 TEST_F(ShortcutsDatabaseTest, UpdateShortcut) {
   AddAll();
-  Shortcut shortcut(ShortcutFromTestInfo(shortcut_test_db[1]));
+  ShortcutsBackend::Shortcut shortcut(
+      ShortcutFromTestInfo(shortcut_test_db[1]));
   shortcut.contents = ASCIIToUTF16("gro.todhsals");
   EXPECT_TRUE(db_->UpdateShortcut(shortcut));
-  std::map<std::string, Shortcut> shortcuts;
+  ShortcutsDatabase::GuidToShortcutMap shortcuts;
   EXPECT_TRUE(db_->LoadShortcuts(&shortcuts));
-  std::map<std::string, Shortcut>::iterator it = shortcuts.find(shortcut.id);
+  ShortcutsDatabase::GuidToShortcutMap::iterator it =
+      shortcuts.find(shortcut.id);
   EXPECT_TRUE(it != shortcuts.end());
   EXPECT_TRUE(it->second.contents == shortcut.contents);
 }
@@ -139,10 +133,10 @@
   EXPECT_TRUE(db_->DeleteShortcutsWithIds(shortcut_ids));
   EXPECT_EQ(arraysize(shortcut_test_db) - 2, CountRecords());
 
-  std::map<std::string, Shortcut> shortcuts;
+  ShortcutsDatabase::GuidToShortcutMap shortcuts;
   EXPECT_TRUE(db_->LoadShortcuts(&shortcuts));
 
-  std::map<std::string, Shortcut>::iterator it =
+  ShortcutsDatabase::GuidToShortcutMap::iterator it =
       shortcuts.find(shortcut_test_db[0].guid);
   EXPECT_TRUE(it == shortcuts.end());
 
@@ -159,10 +153,10 @@
   EXPECT_TRUE(db_->DeleteShortcutsWithUrl("http://slashdot.org/"));
   EXPECT_EQ(arraysize(shortcut_test_db) - 2, CountRecords());
 
-  std::map<std::string, Shortcut> shortcuts;
+  ShortcutsDatabase::GuidToShortcutMap shortcuts;
   EXPECT_TRUE(db_->LoadShortcuts(&shortcuts));
 
-  std::map<std::string, Shortcut>::iterator it =
+  ShortcutsDatabase::GuidToShortcutMap::iterator it =
       shortcuts.find(shortcut_test_db[0].guid);
   EXPECT_TRUE(it != shortcuts.end());
 
@@ -175,7 +169,7 @@
 
 TEST_F(ShortcutsDatabaseTest, LoadShortcuts) {
   AddAll();
-  std::map<std::string, Shortcut> shortcuts;
+  ShortcutsDatabase::GuidToShortcutMap shortcuts;
   EXPECT_TRUE(db_->LoadShortcuts(&shortcuts));
 
   for (size_t i = 0; i < arraysize(shortcut_test_db); ++i) {
@@ -187,7 +181,7 @@
 
 TEST_F(ShortcutsDatabaseTest, DeleteAllShortcuts) {
   AddAll();
-  std::map<std::string, Shortcut> shortcuts;
+  ShortcutsDatabase::GuidToShortcutMap shortcuts;
   EXPECT_TRUE(db_->LoadShortcuts(&shortcuts));
   EXPECT_EQ(arraysize(shortcut_test_db), shortcuts.size());
   EXPECT_TRUE(db_->DeleteAllShortcuts());