Remove redandunt chrome/common include from chrome/browser/search_engines

chrome/browser/search_engines/template_url_prepopulate_data.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/search_engines/template_url_prepopulate_data.h"
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 #include <locale.h>
 #endif
 
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "base/stl_util.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/common/pref_names.h"
 #include "components/google/core/browser/google_util.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/search_engines/prepopulated_engines.h"
+#include "components/search_engines/search_engines_pref_names.h"
 #include "components/search_engines/template_url.h"
 #include "content/public/browser/browser_thread.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "url/gurl.h"
 
 #if defined(OS_WIN)
 #undef IN  // On Windows, windef.h defines this, which screws up "India" cases.
@@ skipping 635 matching lines @@
 
 int GetCountryIDFromPrefs(PrefService* prefs) {
   if (!prefs)
     return GetCurrentCountryID();
 
   // Cache first run Country ID value in prefs, and use it afterwards.  This
   // ensures that just because the user moves around, we won't automatically
   // make major changes to their available search providers, which would feel
   // surprising.
   if (!prefs->HasPrefPath(prefs::kCountryIDAtInstall)) {
-    int new_country_id = GetCurrentCountryID();
-#if defined(OS_WIN)
-    // Migrate the old platform-specific value if it's present.
-    if (prefs->HasPrefPath(prefs::kGeoIDAtInstall)) {
-      int geo_id = prefs->GetInteger(prefs::kGeoIDAtInstall);
-      prefs->ClearPref(prefs::kGeoIDAtInstall);
-      new_country_id = GeoIDToCountryID(geo_id);
-    }
-#endif
-    prefs->SetInteger(prefs::kCountryIDAtInstall, new_country_id);
+    prefs->SetInteger(prefs::kCountryIDAtInstall, GetCurrentCountryID());
   }
   return prefs->GetInteger(prefs::kCountryIDAtInstall);
 }
 
 void GetPrepopulationSetFromCountryID(PrefService* prefs,
                                       const PrepopulatedEngine*** engines,
                                       size_t* num_engines) {
   // NOTE: This function should ALWAYS set its outparams.
 
   // If you add a new country make sure to update the unit test for coverage.
@@ skipping 518 matching lines @@
   registry->RegisterIntegerPref(
       prefs::kCountryIDAtInstall,
       kCountryIDUnknown,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterListPref(prefs::kSearchProviderOverrides,
                              user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterIntegerPref(
       prefs::kSearchProviderOverridesVersion,
       -1,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
-  // Obsolete pref, for migration.
-  registry->RegisterIntegerPref(
-      prefs::kGeoIDAtInstall,
-      -1,
-      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 }
 
 int GetDataVersion(PrefService* prefs) {
   // Allow tests to override the local version.
   return (prefs && prefs->HasPrefPath(prefs::kSearchProviderOverridesVersion)) ?
       prefs->GetInteger(prefs::kSearchProviderOverridesVersion) :
       kCurrentDataVersion;
 }
 
 ScopedVector<TemplateURLData> GetPrepopulatedEngines(
@@ skipping 76 matching lines @@
     for (size_t j = 0; j < kAllEngines[i]->alternate_urls_size; ++j) {
       if (SameDomain(url, GURL(kAllEngines[i]->alternate_urls[j])))
         return kAllEngines[i]->type;
     }
   }
 
   return SEARCH_ENGINE_OTHER;
 }
 
 }  // namespace TemplateURLPrepopulateData