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

chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.cc

 // Copyright 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/ui/omnibox/alternate_nav_infobar_delegate.h"
 
 #include "base/strings/utf_string_conversions.h"
+#include "chrome/browser/autocomplete/shortcuts_backend.h"
+#include "chrome/browser/autocomplete/shortcuts_backend_factory.h"
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/history_service_factory.h"
-#include "chrome/browser/history/shortcuts_backend.h"
-#include "chrome/browser/history/shortcuts_backend_factory.h"
 #include "chrome/browser/infobars/infobar.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 
 AlternateNavInfoBarDelegate::~AlternateNavInfoBarDelegate() {
@@ skipping 38 matching lines @@
 }
 
 base::string16 AlternateNavInfoBarDelegate::GetLinkText() const {
   return base::UTF8ToUTF16(match_.destination_url.spec());
 }
 
 bool AlternateNavInfoBarDelegate::LinkClicked(
     WindowOpenDisposition disposition) {
   // Tell the shortcuts backend to remove the shortcut it added for the original
   // search and instead add one reflecting this navigation.
-  scoped_refptr<history::ShortcutsBackend> shortcuts_backend(
+  scoped_refptr<ShortcutsBackend> shortcuts_backend(
       ShortcutsBackendFactory::GetForProfile(profile_));
   if (shortcuts_backend) {  // May be NULL in incognito.
-    shortcuts_backend->DeleteShortcutsWithUrl(search_url_);
+    shortcuts_backend->DeleteShortcutsWithURL(search_url_);
     shortcuts_backend->AddOrUpdateShortcut(text_, match_);
   }
 
   // Tell the history system to remove any saved search term for the search.
   HistoryService* const history_service =
       HistoryServiceFactory::GetForProfile(profile_, Profile::IMPLICIT_ACCESS);
   if (history_service)
     history_service->DeleteKeywordSearchTermForURL(search_url_);
 
   // Pretend the user typed this URL, so that navigating to it will be the
   // default action when it's typed again in the future.
   web_contents()->OpenURL(content::OpenURLParams(
       match_.destination_url, content::Referrer(), disposition,
       content::PAGE_TRANSITION_TYPED, false));
 
   // We should always close, even if the navigation did not occur within this
   // WebContents.
   return true;
 }
 
 int AlternateNavInfoBarDelegate::GetIconID() const {
   return IDR_INFOBAR_ALT_NAV_URL;
 }
 
 InfoBarDelegate::Type AlternateNavInfoBarDelegate::GetInfoBarType() const {
   return PAGE_ACTION_TYPE;
 }