Revert of Use the DefaultSearchManager as the exclusive authority on DSE, ignoring Web Data.

chrome/browser/search_engines/default_search_pref_migration.cc

Index: chrome/browser/search_engines/default_search_pref_migration.cc
diff --git a/chrome/browser/search_engines/default_search_pref_migration.cc b/chrome/browser/search_engines/default_search_pref_migration.cc
index 0424194cb57d0325396c67a13ef0b38680bc7334..835254a3c21a1376561e1d1149a363108fb2e63f 100644
--- a/chrome/browser/search_engines/default_search_pref_migration.cc
+++ b/chrome/browser/search_engines/default_search_pref_migration.cc
@@ -13,7 +13,6 @@
 #include "chrome/browser/search_engines/default_search_manager.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
-#include "chrome/common/pref_names.h"
 
 namespace {
 
@@ -27,25 +26,6 @@
       pref_service, &legacy_dse_from_prefs, &legacy_is_managed);
   return legacy_is_managed ?
       scoped_ptr<TemplateURLData>() : legacy_dse_from_prefs.Pass();
-}
-
-void ClearDefaultSearchProviderFromLegacyPrefs(PrefService* prefs) {
-  prefs->ClearPref(prefs::kDefaultSearchProviderName);
-  prefs->ClearPref(prefs::kDefaultSearchProviderKeyword);
-  prefs->ClearPref(prefs::kDefaultSearchProviderSearchURL);
-  prefs->ClearPref(prefs::kDefaultSearchProviderSuggestURL);
-  prefs->ClearPref(prefs::kDefaultSearchProviderInstantURL);
-  prefs->ClearPref(prefs::kDefaultSearchProviderImageURL);
-  prefs->ClearPref(prefs::kDefaultSearchProviderNewTabURL);
-  prefs->ClearPref(prefs::kDefaultSearchProviderSearchURLPostParams);
-  prefs->ClearPref(prefs::kDefaultSearchProviderSuggestURLPostParams);
-  prefs->ClearPref(prefs::kDefaultSearchProviderInstantURLPostParams);
-  prefs->ClearPref(prefs::kDefaultSearchProviderImageURLPostParams);
-  prefs->ClearPref(prefs::kDefaultSearchProviderIconURL);
-  prefs->ClearPref(prefs::kDefaultSearchProviderEncodings);
-  prefs->ClearPref(prefs::kDefaultSearchProviderPrepopulateID);
-  prefs->ClearPref(prefs::kDefaultSearchProviderAlternateURLs);
-  prefs->ClearPref(prefs::kDefaultSearchProviderSearchTermsReplacementKey);
 }
 
 void MigrateDefaultSearchPref(PrefService* pref_service) {
@@ -75,7 +55,8 @@
     }
   }
 
-  ClearDefaultSearchProviderFromLegacyPrefs(pref_service);
+  // TODO(erikwright): Clear the legacy value when the modern value is the
+  // authority.
 }
 
 void OnPrefsInitialized(PrefService* pref_service,