Move the ShortcutsBackend from history to autocomplete so that it can fully

chrome/browser/autocomplete/shortcuts_provider_unittest.cc

 // Copyright (c) 2012 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 "chrome/browser/autocomplete/shortcuts_provider.h"
 
 #include <math.h>
 
 #include <algorithm>
 #include <functional>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_input.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/autocomplete/autocomplete_provider.h"
 #include "chrome/browser/autocomplete/autocomplete_provider_listener.h"
 #include "chrome/browser/autocomplete/autocomplete_result.h"
+#include "chrome/browser/autocomplete/shortcuts_backend.h"
+#include "chrome/browser/autocomplete/shortcuts_backend_factory.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/in_memory_url_index.h"
-#include "chrome/browser/history/shortcuts_backend.h"
-#include "chrome/browser/history/shortcuts_backend_factory.h"
 #include "chrome/browser/history/url_database.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/test_browser_thread.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_builder.h"
 #include "extensions/common/value_builder.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 164 matching lines @@
 }
 
 ClassifyTest::~ClassifyTest() {
 }
 
 ACMatchClassifications ClassifyTest::RunTest(const base::string16& find_text) {
   return ShortcutsProvider::ClassifyAllMatchesInString(find_text,
       ShortcutsProvider::CreateWordMapForString(find_text), text_, matches_);
 }
 
-namespace history {
-
 
 // ShortcutsProviderTest ------------------------------------------------------
 
 class ShortcutsProviderTest : public testing::Test,
                               public AutocompleteProviderListener {
  public:
   ShortcutsProviderTest();
 
   // AutocompleteProviderListener:
   virtual void OnProviderUpdate(bool updated_matches) OVERRIDE;
@@ skipping 30 matching lines @@
   // match, and it should have inline autocompletion
   // |top_result_inline_autocompletion|.
   void RunTest(const base::string16 text,
                bool prevent_inline_autocomplete,
                const ExpectedURLs& expected_urls,
                std::string expected_top_result,
                base::string16 top_result_inline_autocompletion);
 
   // Passthrough to the private function in provider_.
   int CalculateScore(const std::string& terms,
-                     const ShortcutsBackend::Shortcut& shortcut,
+                     const history::ShortcutsDatabase::Shortcut& shortcut,
                      int max_relevance);
 
   base::MessageLoopForUI message_loop_;
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread file_thread_;
 
   TestingProfile profile_;
 
   ACMatches ac_matches_;  // The resulting matches after running RunTest.
 
@@ skipping 23 matching lines @@
   // and prevent it from being deleted.
   message_loop_.RunUntilIdle();
   provider_ = NULL;
 }
 
 void ShortcutsProviderTest::FillData(TestShortcutInfo* db, size_t db_size) {
   DCHECK(provider_.get());
   size_t expected_size = backend_->shortcuts_map().size() + db_size;
   for (size_t i = 0; i < db_size; ++i) {
     const TestShortcutInfo& cur = db[i];
-    ShortcutsBackend::Shortcut shortcut(
+    history::ShortcutsDatabase::Shortcut shortcut(
         cur.guid, ASCIIToUTF16(cur.text),
-        ShortcutsBackend::Shortcut::MatchCore(
+        history::ShortcutsDatabase::Shortcut::MatchCore(
             ASCIIToUTF16(cur.fill_into_edit), GURL(cur.destination_url),
-            ASCIIToUTF16(cur.contents),
-            AutocompleteMatch::ClassificationsFromString(cur.contents_class),
-            ASCIIToUTF16(cur.description),
-            AutocompleteMatch::ClassificationsFromString(cur.description_class),
+            ASCIIToUTF16(cur.contents), cur.contents_class,
+            ASCIIToUTF16(cur.description), cur.description_class,
             cur.transition, cur.type, ASCIIToUTF16(cur.keyword)),
         base::Time::Now() - base::TimeDelta::FromDays(cur.days_from_now),
         cur.number_of_hits);
     backend_->AddShortcut(shortcut);
   }
   EXPECT_EQ(expected_size, backend_->shortcuts_map().size());
 }
 
 ShortcutsProviderTest::SetShouldContain::SetShouldContain(
     const ACMatches& matched_urls) {
@@ skipping 43 matching lines @@
     std::partial_sort(ac_matches_.begin(), ac_matches_.begin() + 1,
                       ac_matches_.end(), AutocompleteMatch::MoreRelevant);
     EXPECT_EQ(expected_top_result, ac_matches_[0].destination_url.spec());
     EXPECT_EQ(top_result_inline_autocompletion,
               ac_matches_[0].inline_autocompletion);
   }
 }
 
 int ShortcutsProviderTest::CalculateScore(
     const std::string& terms,
-    const ShortcutsBackend::Shortcut& shortcut,
+    const history::ShortcutsDatabase::Shortcut& shortcut,
     int max_relevance) {
   return provider_->CalculateScore(ASCIIToUTF16(terms), shortcut,
                                    max_relevance);
 }
 
 
 // Actual tests ---------------------------------------------------------------
 
 TEST_F(ShortcutsProviderTest, SimpleSingleMatch) {
   base::string16 text(ASCIIToUTF16("go"));
@@ skipping 251 matching lines @@
   matches = AutocompleteMatch::ClassificationsFromString("0,1,11,0");
   ClassifyTest classify_test7(ASCIIToUTF16("http://a.co is great"), matches);
 
   ACMatchClassifications spans_l =
       classify_test7.RunTest(ASCIIToUTF16("ht co"));
   EXPECT_EQ("0,3,2,1,9,3,11,0",
             AutocompleteMatch::ClassificationsToString(spans_l));
 }
 
 TEST_F(ShortcutsProviderTest, CalculateScore) {
-  ShortcutsBackend::Shortcut shortcut(
+  history::ShortcutsDatabase::Shortcut shortcut(
       std::string(), ASCIIToUTF16("test"),
-      ShortcutsBackend::Shortcut::MatchCore(
+      history::ShortcutsDatabase::Shortcut::MatchCore(
           ASCIIToUTF16("www.test.com"), GURL("http://www.test.com"),
-          ASCIIToUTF16("www.test.com"),
-          AutocompleteMatch::ClassificationsFromString("0,1,4,3,8,1"),
-          ASCIIToUTF16("A test"),
-          AutocompleteMatch::ClassificationsFromString("0,0,2,2"),
-          content::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL,
-          base::string16()),
+          ASCIIToUTF16("www.test.com"), "0,1,4,3,8,1",
+          ASCIIToUTF16("A test"), "0,0,2,2", content::PAGE_TRANSITION_TYPED,
+          AutocompleteMatchType::HISTORY_URL, base::string16()),
       base::Time::Now(), 1);
 
   // Maximal score.
   const int max_relevance = AutocompleteResult::kLowestDefaultScore - 1;
   const int kMaxScore = CalculateScore("test", shortcut, max_relevance);
 
   // Score decreases as percent of the match is decreased.
   int score_three_quarters = CalculateScore("tes", shortcut, max_relevance);
   EXPECT_LT(score_three_quarters, kMaxScore);
   int score_one_half = CalculateScore("te", shortcut, max_relevance);
@@ skipping 110 matching lines @@
   extensions::UnloadedExtensionInfo details(
       extension.get(), extensions::UnloadedExtensionInfo::REASON_UNINSTALL);
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_EXTENSION_UNLOADED,
       content::Source<Profile>(&profile_),
       content::Details<extensions::UnloadedExtensionInfo>(&details));
 
   // Now the URL should have disappeared.
   RunTest(text, false, ExpectedURLs(), std::string(), base::string16());
 }
-
-}  // namespace history