Revert of Componentize TemplateURLService

chrome/browser/search_engines/default_search_pref_migration.cc

 // Copyright 2014 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/search_engines/default_search_pref_migration.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
+#include "chrome/browser/search_engines/template_url_service.h"
 #include "components/search_engines/default_search_manager.h"
 #include "components/search_engines/search_engines_pref_names.h"
 #include "components/search_engines/template_url_data.h"
-#include "components/search_engines/template_url_service.h"
 
 namespace {
 
 // Loads the user-selected DSE (if there is one, and it's not masked by policy
 // or an extension) from legacy preferences.
 scoped_ptr<TemplateURLData> LoadDefaultSearchProviderFromPrefs(
     PrefService* pref_service) {
   scoped_ptr<TemplateURLData> legacy_dse_from_prefs;
   bool legacy_is_managed = false;
   TemplateURLService::LoadDefaultSearchProviderFromPrefs(
@@ skipping 61 matching lines @@
 void ConfigureDefaultSearchPrefMigrationToDictionaryValue(
     PrefService* pref_service) {
   if (pref_service->GetInitializationStatus() ==
       PrefService::INITIALIZATION_STATUS_WAITING) {
     pref_service->AddPrefInitObserver(
         base::Bind(&OnPrefsInitialized, base::Unretained(pref_service)));
   } else {
     MigrateDefaultSearchPref(pref_service);
   }
 }