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

chrome/browser/autocomplete/shortcuts_provider.h

 // 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.
 
 #ifndef CHROME_BROWSER_AUTOCOMPLETE_SHORTCUTS_PROVIDER_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_SHORTCUTS_PROVIDER_H_
 
 #include <map>
 #include <set>
 #include <string>
 
 #include "base/gtest_prod_util.h"
 #include "chrome/browser/autocomplete/autocomplete_provider.h"
+#include "chrome/browser/autocomplete/shortcuts_backend.h"
 #include "chrome/browser/autocomplete/url_prefix.h"
-#include "chrome/browser/history/shortcuts_backend.h"
 
 class Profile;
-
-namespace history {
 class ShortcutsProviderTest;
-}
 
 // Provider of recently autocompleted links. Provides autocomplete suggestions
 // from previously selected suggestions. The more often a user selects a
 // suggestion for a given search term the higher will be that suggestion's
 // ranking for future uses of that search term.
 class ShortcutsProvider
     : public AutocompleteProvider,
-      public history::ShortcutsBackend::ShortcutsBackendObserver {
+      public ShortcutsBackend::ShortcutsBackendObserver {
  public:
   ShortcutsProvider(AutocompleteProviderListener* listener, Profile* profile);
 
   // Performs the autocompletion synchronously. Since no asynch completion is
   // performed |minimal_changes| is ignored.
   virtual void Start(const AutocompleteInput& input,
                      bool minimal_changes) OVERRIDE;
 
   virtual void DeleteMatch(const AutocompleteMatch& match) OVERRIDE;
 
  private:
   friend class ClassifyTest;
-  friend class history::ShortcutsProviderTest;
+  friend class ShortcutsProviderTest;
 
   typedef std::multimap<base::char16, base::string16> WordMap;
 
   virtual ~ShortcutsProvider();
 
   // ShortcutsBackendObserver:
   virtual void OnShortcutsLoaded() OVERRIDE;
 
   // Performs the autocomplete matching and scoring.
   void GetMatches(const AutocompleteInput& input);
 
   // Returns an AutocompleteMatch corresponding to |shortcut|. Assigns it
   // |relevance| score in the process, and highlights the description and
   // contents against |term_string|, which should be the lower-cased version
   // of the user's input.  |term_string| and |fixed_up_term_string| are used
   // to decide what can be inlined. If |prevent_inline_autocomplete|, no
   // matches with inline completions will be allowed to be the default match.
   AutocompleteMatch ShortcutToACMatch(
-      const history::ShortcutsBackend::Shortcut& shortcut,
+      const history::ShortcutsDatabase::Shortcut& shortcut,
       int relevance,
       const base::string16& term_string,
       const base::string16& fixed_up_term_string,
       const bool prevent_inline_autocomplete);
 
   // Returns a map mapping characters to groups of words from |text| that start
   // with those characters, ordered lexicographically descending so that longer
   // words appear before their prefixes (if any) within a particular
   // equal_range().
   static WordMap CreateWordMapForString(const base::string16& text);
@@ skipping 19 matching lines @@
   // |find_text| (and thus |find_words|) are expected to be lowercase.  |text|
   // will be lowercased in this function.
   static ACMatchClassifications ClassifyAllMatchesInString(
       const base::string16& find_text,
       const WordMap& find_words,
       const base::string16& text,
       const ACMatchClassifications& original_class);
 
   // Returns iterator to first item in |shortcuts_map_| matching |keyword|.
   // Returns shortcuts_map_.end() if there are no matches.
-  history::ShortcutsBackend::ShortcutMap::const_iterator FindFirstMatch(
+  ShortcutsBackend::ShortcutMap::const_iterator FindFirstMatch(
       const base::string16& keyword,
-      history::ShortcutsBackend* backend);
+      ShortcutsBackend* backend);
 
-  int CalculateScore(
-      const base::string16& terms,
-      const history::ShortcutsBackend::Shortcut& shortcut,
-      int max_relevance);
+  int CalculateScore(const base::string16& terms,
+                     const history::ShortcutsDatabase::Shortcut& shortcut,
+                     int max_relevance);
 
   std::string languages_;
   bool initialized_;
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_SHORTCUTS_PROVIDER_H_