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

chrome/browser/autocomplete/shortcuts_provider.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 <algorithm>
 #include <cmath>
 #include <map>
 #include <vector>
 
 #include "base/i18n/break_iterator.h"
 #include "base/i18n/case_conversion.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "chrome/browser/autocomplete/autocomplete_input.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/autocomplete/autocomplete_provider_listener.h"
 #include "chrome/browser/autocomplete/autocomplete_result.h"
 #include "chrome/browser/autocomplete/history_provider.h"
+#include "chrome/browser/autocomplete/shortcuts_backend_factory.h"
 #include "chrome/browser/autocomplete/url_prefix.h"
 #include "chrome/browser/history/history_notifications.h"
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/history_service_factory.h"
-#include "chrome/browser/history/shortcuts_backend_factory.h"
 #include "chrome/browser/omnibox/omnibox_field_trial.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/net/url_fixer_upper.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "url/url_parse.h"
 
 namespace {
 
 class DestinationURLEqualsURL {
@@ skipping 28 matching lines @@
 }
 
 }  // namespace
 
 ShortcutsProvider::ShortcutsProvider(AutocompleteProviderListener* listener,
                                      Profile* profile)
     : AutocompleteProvider(listener, profile,
           AutocompleteProvider::TYPE_SHORTCUTS),
       languages_(profile_->GetPrefs()->GetString(prefs::kAcceptLanguages)),
       initialized_(false) {
-  scoped_refptr<history::ShortcutsBackend> backend =
+  scoped_refptr<ShortcutsBackend> backend =
       ShortcutsBackendFactory::GetForProfile(profile_);
   if (backend.get()) {
     backend->AddObserver(this);
     if (backend->initialized())
       initialized_ = true;
   }
 }
 
 void ShortcutsProvider::Start(const AutocompleteInput& input,
                               bool minimal_changes) {
@@ skipping 18 matching lines @@
     base::HistogramBase* counter = base::Histogram::FactoryGet(
         name, 1, 1000, 50, base::Histogram::kUmaTargetedHistogramFlag);
     counter->Add(static_cast<int>((end_time - start_time).InMilliseconds()));
   }
   UpdateStarredStateOfMatches();
 }
 
 void ShortcutsProvider::DeleteMatch(const AutocompleteMatch& match) {
   // Copy the URL since deleting from |matches_| will invalidate |match|.
   GURL url(match.destination_url);
+  DCHECK(url.is_valid());
 
   // When a user deletes a match, he probably means for the URL to disappear out
   // of history entirely. So nuke all shortcuts that map to this URL.
-  scoped_refptr<history::ShortcutsBackend> backend =
+  scoped_refptr<ShortcutsBackend> backend =
       ShortcutsBackendFactory::GetForProfileIfExists(profile_);
   if (backend) // Can be NULL in Incognito.
-    backend->DeleteShortcutsWithUrl(url);
+    backend->DeleteShortcutsWithURL(url);
 
   matches_.erase(std::remove_if(matches_.begin(), matches_.end(),
                                 DestinationURLEqualsURL(url)),
                  matches_.end());
   // NOTE: |match| is now dead!
 
   // Delete the match from the history DB. This will eventually result in a
-  // second call to DeleteShortcutsWithURLs(), which is harmless.
+  // second call to DeleteShortcutsWithURL(), which is harmless.
   HistoryService* const history_service =
       HistoryServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS);
-
-  DCHECK(history_service && url.is_valid());
+  DCHECK(history_service);
   history_service->DeleteURL(url);
 }
 
 ShortcutsProvider::~ShortcutsProvider() {
-  scoped_refptr<history::ShortcutsBackend> backend =
+  scoped_refptr<ShortcutsBackend> backend =
       ShortcutsBackendFactory::GetForProfileIfExists(profile_);
   if (backend.get())
     backend->RemoveObserver(this);
 }
 
 void ShortcutsProvider::OnShortcutsLoaded() {
   initialized_ = true;
 }
 
 void ShortcutsProvider::GetMatches(const AutocompleteInput& input) {
-  scoped_refptr<history::ShortcutsBackend> backend =
+  scoped_refptr<ShortcutsBackend> backend =
       ShortcutsBackendFactory::GetForProfileIfExists(profile_);
   if (!backend.get())
     return;
   // Get the URLs from the shortcuts database with keys that partially or
   // completely match the search term.
   base::string16 term_string(base::i18n::ToLower(input.text()));
   DCHECK(!term_string.empty());
 
   base::string16 fixed_up_term_string(term_string);
   AutocompleteInput fixed_up_input(input);
   if (FixupUserInput(&fixed_up_input))
     fixed_up_term_string = fixed_up_input.text();
 
   int max_relevance;
   if (!OmniboxFieldTrial::ShortcutsScoringMaxRelevance(
       input.current_page_classification(), &max_relevance))
     max_relevance = AutocompleteResult::kLowestDefaultScore - 1;
 
-  for (history::ShortcutsBackend::ShortcutMap::const_iterator it =
+  for (ShortcutsBackend::ShortcutMap::const_iterator it =
            FindFirstMatch(term_string, backend.get());
        it != backend->shortcuts_map().end() &&
            StartsWith(it->first, term_string, true); ++it) {
     // Don't return shortcuts with zero relevance.
     int relevance = CalculateScore(term_string, it->second, max_relevance);
     if (relevance) {
       matches_.push_back(ShortcutToACMatch(
           it->second, relevance, term_string, fixed_up_term_string,
           input.prevent_inline_autocomplete()));
       matches_.back().ComputeStrippedDestinationURL(profile_);
@@ skipping 28 matching lines @@
   }
   for (ACMatches::iterator it = matches_.begin(); it != matches_.end(); ++it) {
     max_relevance = std::min(max_relevance, it->relevance);
     it->relevance = max_relevance;
     if (max_relevance > 1)
       --max_relevance;
   }
 }
 
 AutocompleteMatch ShortcutsProvider::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) {
   DCHECK(!term_string.empty());
-  AutocompleteMatch match(shortcut.match_core.ToMatch());
+  AutocompleteMatch match;
   match.provider = this;
   match.relevance = relevance;
   match.deletable = true;
+  match.fill_into_edit = shortcut.match_core.fill_into_edit;
+  match.destination_url = shortcut.match_core.destination_url;
   DCHECK(match.destination_url.is_valid());
+  match.contents = shortcut.match_core.contents;
+  match.contents_class = AutocompleteMatch::ClassificationsFromString(
+      shortcut.match_core.contents_class);
+  match.description = shortcut.match_core.description;
+  match.description_class = AutocompleteMatch::ClassificationsFromString(
+      shortcut.match_core.description_class);
+  match.transition =
+      static_cast<content::PageTransition>(shortcut.match_core.transition);
+  match.type = static_cast<AutocompleteMatch::Type>(shortcut.match_core.type);
+  match.keyword = shortcut.match_core.keyword;
   match.RecordAdditionalInfo("number of hits", shortcut.number_of_hits);
   match.RecordAdditionalInfo("last access time", shortcut.last_access_time);
   match.RecordAdditionalInfo("original input text",
                              base::UTF16ToUTF8(shortcut.text));
 
   // Set |inline_autocompletion| and |allowed_to_be_default_match| if possible.
   // If the match is a search query this is easy: simply check whether the
   // user text is a prefix of the query.  If the match is a navigation, we
   // assume the fill_into_edit looks something like a URL, so we use
   // BestURLPrefix() to try and strip off any prefixes that the user might
@@ skipping 141 matching lines @@
         last_position = word_end;
         break;
       }
     }
     last_position = std::max(last_position, next_character);
   }
 
   return AutocompleteMatch::MergeClassifications(original_class, match_class);
 }
 
-history::ShortcutsBackend::ShortcutMap::const_iterator
+ShortcutsBackend::ShortcutMap::const_iterator
     ShortcutsProvider::FindFirstMatch(const base::string16& keyword,
-                                      history::ShortcutsBackend* backend) {
+                                      ShortcutsBackend* backend) {
   DCHECK(backend);
-  history::ShortcutsBackend::ShortcutMap::const_iterator it =
+  ShortcutsBackend::ShortcutMap::const_iterator it =
       backend->shortcuts_map().lower_bound(keyword);
   // Lower bound not necessarily matches the keyword, check for item pointed by
   // the lower bound iterator to at least start with keyword.
   return ((it == backend->shortcuts_map().end()) ||
     StartsWith(it->first, keyword, true)) ? it :
     backend->shortcuts_map().end();
 }
 
 int ShortcutsProvider::CalculateScore(
     const base::string16& terms,
-    const history::ShortcutsBackend::Shortcut& shortcut,
+    const history::ShortcutsDatabase::Shortcut& shortcut,
     int max_relevance) {
   DCHECK(!terms.empty());
   DCHECK_LE(terms.length(), shortcut.text.length());
 
   // The initial score is based on how much of the shortcut the user has typed.
   // Using the square root of the typed fraction boosts the base score rapidly
   // as characters are typed, compared with simply using the typed fraction
   // directly. This makes sense since the first characters typed are much more
   // important for determining how likely it is a user wants a particular
   // shortcut than are the remaining continued characters.
@@ skipping 13 matching lines @@
   // (1.0 / each 5 additional hits), up to a maximum of 5x as long.
   const double kMaxDecaySpeedDivisor = 5.0;
   const double kNumUsesPerDecaySpeedDivisorIncrement = 5.0;
   double decay_divisor = std::min(kMaxDecaySpeedDivisor,
       (shortcut.number_of_hits + kNumUsesPerDecaySpeedDivisorIncrement - 1) /
       kNumUsesPerDecaySpeedDivisorIncrement);
 
   return static_cast<int>((base_score / exp(decay_exponent / decay_divisor)) +
       0.5);
 }