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 5a33f5532ad8ee91d17e1a8dcf142024fec84f93..d7f5579133e051ebcb9ab578ede131e1c9d6543e 100644
--- a/chrome/browser/search_engines/default_search_pref_migration.cc
+++ b/chrome/browser/search_engines/default_search_pref_migration.cc
@@ -13,6 +13,7 @@
 #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 {
 
@@ -29,6 +30,25 @@ scoped_ptr<TemplateURLData> LoadDefaultSearchProviderFromPrefs(
   return 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) {
   DCHECK(pref_service);
 
@@ -56,8 +76,7 @@ void MigrateDefaultSearchPref(PrefService* pref_service) {
     }
   }
 
-  // TODO(erikwright): Clear the legacy value when the modern value is the
-  // authority.
+  ClearDefaultSearchProviderFromLegacyPrefs(pref_service);
 }
 
 void OnPrefsInitialized(PrefService* pref_service,