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

chrome/browser/search/instant_service.cc

Index: chrome/browser/search/instant_service.cc
diff --git a/chrome/browser/search/instant_service.cc b/chrome/browser/search/instant_service.cc
index 5196408d71dcefcc7632d31e12e1feaadc41e056..bcf0ffbea4ffa66a929c0e18442c235757bb6c67 100644
--- a/chrome/browser/search/instant_service.cc
+++ b/chrome/browser/search/instant_service.cc
@@ -13,6 +13,7 @@
 #include "chrome/browser/search/local_ntp_source.h"
 #include "chrome/browser/search/most_visited_iframe_source.h"
 #include "chrome/browser/search/search.h"
+#include "chrome/browser/search/suggestions/suggestions_service.h"
 #include "chrome/browser/search/suggestions/suggestions_source.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
@@ -119,24 +120,10 @@ InstantService::InstantService(Profile* profile)
       profile_, new FaviconSource(profile_, FaviconSource::FAVICON));
   content::URLDataSource::Add(profile_, new LocalNtpSource(profile_));
   content::URLDataSource::Add(profile_, new MostVisitedIframeSource());
-<<<<<<< HEAD

[Peter Kasting, 2014/05/07 23:38:29]

Hmm, looks like maybe your checkout wasn't rebased against master properly or
something.

-  content::URLDataSource::Add(
-      profile_, new suggestions::SuggestionsSource(profile_));
-
-  profile_pref_registrar_.Init(profile_->GetPrefs());
-  profile_pref_registrar_.Add(
-      prefs::kDefaultSearchProviderID,
-      base::Bind(&InstantService::OnDefaultSearchProviderChanged,
-                 base::Unretained(this)));
-
-  registrar_.Add(this, chrome::NOTIFICATION_GOOGLE_URL_UPDATED,
-                 content::Source<Profile>(profile_->GetOriginalProfile()));
-=======
   if (suggestions::SuggestionsService::IsEnabled()) {
     content::URLDataSource::Add(
         profile_, new suggestions::SuggestionsSource(profile_));
   }
->>>>>>> dse_turn_it_on_base
 }
 
 InstantService::~InstantService() {