Revert of Reduces dependency from AutocompleteMatch to Profile.

chrome/browser/autocomplete/shortcuts_backend.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_backend.h"
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/guid.h"
 #include "base/i18n/case_conversion.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/autocomplete/autocomplete_result.h"
 #include "chrome/browser/autocomplete/base_search_provider.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/history/history_notifications.h"
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/shortcuts_database.h"
 #include "chrome/browser/omnibox/omnibox_log.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/search_engines/ui_thread_search_terms_data.h"
 #include "chrome/common/autocomplete_match_type.h"
 #include "chrome/common/chrome_constants.h"
 #include "components/autocomplete/autocomplete_input.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "extensions/common/extension.h"
 
 using content::BrowserThread;
@@ skipping 101 matching lines @@
 }
 
 ShortcutsBackend::~ShortcutsBackend() {
 }
 
 // static
 history::ShortcutsDatabase::Shortcut::MatchCore
     ShortcutsBackend::MatchToMatchCore(const AutocompleteMatch& match,
                                        Profile* profile) {
   const AutocompleteMatch::Type match_type = GetTypeForShortcut(match.type);
-  TemplateURLService* service =
-      TemplateURLServiceFactory::GetForProfile(profile);
   const AutocompleteMatch& normalized_match =
       AutocompleteMatch::IsSpecializedSearchType(match.type) ?
           BaseSearchProvider::CreateSearchSuggestion(
               match.search_terms_args->search_terms, match_type,
               (match.transition == content::PAGE_TRANSITION_KEYWORD),
-              match.GetTemplateURL(service, false),
+              match.GetTemplateURL(profile, false),
               UIThreadSearchTermsData(profile)) :
           match;
   return history::ShortcutsDatabase::Shortcut::MatchCore(
       normalized_match.fill_into_edit, normalized_match.destination_url,
       normalized_match.contents,
       StripMatchMarkers(normalized_match.contents_class),
       normalized_match.description,
       StripMatchMarkers(normalized_match.description_class),
       normalized_match.transition, match_type, normalized_match.keyword);
 }
@@ skipping 154 matching lines @@
   guid_map_.clear();
   FOR_EACH_OBSERVER(ShortcutsBackendObserver, observer_list_,
                     OnShortcutsChanged());
   return no_db_access_ ||
       BrowserThread::PostTask(
           BrowserThread::DB, FROM_HERE,
           base::Bind(base::IgnoreResult(
                          &history::ShortcutsDatabase::DeleteAllShortcuts),
                      db_.get()));
 }