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

chrome/browser/search_engines/default_search_manager.cc

Index: chrome/browser/search_engines/default_search_manager.cc
diff --git a/chrome/browser/search_engines/default_search_manager.cc b/chrome/browser/search_engines/default_search_manager.cc
index d905a42d293f81e54889dfffe0a638b8e007438f..e7d07b71c297c183de04e2bf52765006a6d319c4 100644
--- a/chrome/browser/search_engines/default_search_manager.cc
+++ b/chrome/browser/search_engines/default_search_manager.cc
@@ -30,14 +30,21 @@
 
 namespace {
 
+bool IsDefaultSearchProviderManaged(PrefService* pref_service) {
+  const PrefService::Preference* pref = pref_service->FindPreference(
+      DefaultSearchManager::kDefaultSearchProviderDataPrefName);
+  DCHECK(pref);
+  return pref->IsManaged();
+}
+
+}  // namespace
+
 // A dictionary to hold all data related to the Default Search Engine.
 // Eventually, this should replace all the data stored in the
 // default_search_provider.* prefs.
-const char kDefaultSearchProviderData[] =
+const char DefaultSearchManager::kDefaultSearchProviderDataPrefName[] =
     "default_search_provider_data.template_url_data";
 
-}  // namespace
-
 const char DefaultSearchManager::kID[] = "id";
 const char DefaultSearchManager::kShortName[] = "short_name";
 const char DefaultSearchManager::kKeyword[] = "keyword";
@@ -74,20 +81,25 @@ const char DefaultSearchManager::kSearchTermsReplacementKey[] =
 const char DefaultSearchManager::kCreatedByPolicy[] = "created_by_policy";
 const char DefaultSearchManager::kDisabledByPolicy[] = "disabled_by_policy";
 
-DefaultSearchManager::DefaultSearchManager(PrefService* pref_service)
-    : pref_service_(pref_service), default_search_controlled_by_policy_(false) {
-  DCHECK(pref_service_);
-  pref_change_registrar_.Init(pref_service_);
-  pref_change_registrar_.Add(
-      kDefaultSearchProviderData,
-      base::Bind(&DefaultSearchManager::OnDefaultSearchPrefChanged,
-                 base::Unretained(this)));
-  pref_change_registrar_.Add(
-      prefs::kSearchProviderOverrides,
-      base::Bind(&DefaultSearchManager::OnOverridesPrefChanged,
-                 base::Unretained(this)));
-  OnDefaultSearchPrefChanged();
-  OnOverridesPrefChanged();
+DefaultSearchManager::DefaultSearchManager(
+    PrefService* pref_service,
+    const ObserverCallback& change_observer)
+    : pref_service_(pref_service),
+      change_observer_(change_observer),
+      default_search_controlled_by_policy_(false) {
+  if (pref_service_) {
+    pref_change_registrar_.Init(pref_service_);
+    pref_change_registrar_.Add(
+        kDefaultSearchProviderDataPrefName,
+        base::Bind(&DefaultSearchManager::OnDefaultSearchPrefChanged,
+                   base::Unretained(this)));
+    pref_change_registrar_.Add(
+        prefs::kSearchProviderOverrides,
+        base::Bind(&DefaultSearchManager::OnOverridesPrefChanged,
+                   base::Unretained(this)));
+  }
+  LoadPrepopulatedDefaultSearch();
+  LoadDefaultSearchEngineFromPrefs();
 }
 
 DefaultSearchManager::~DefaultSearchManager() {
@@ -97,41 +109,57 @@ DefaultSearchManager::~DefaultSearchManager() {
 void DefaultSearchManager::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterDictionaryPref(
-      kDefaultSearchProviderData,
-      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+      kDefaultSearchProviderDataPrefName,
+      user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
 }
 
 // static
 void DefaultSearchManager::AddPrefValueToMap(base::DictionaryValue* value,
                                              PrefValueMap* pref_value_map) {
-  pref_value_map->SetValue(kDefaultSearchProviderData, value);
+  pref_value_map->SetValue(kDefaultSearchProviderDataPrefName, value);
 }
 
-DefaultSearchManager::Source
-DefaultSearchManager::GetDefaultSearchEngineSource() const {
-  if (default_search_controlled_by_policy_)
-    return FROM_POLICY;
-  if (extension_default_search_)
-    return FROM_EXTENSION;
-  if (prefs_default_search_)
-    return FROM_USER;
-
-  return FROM_FALLBACK;
-}
-
-TemplateURLData* DefaultSearchManager::GetDefaultSearchEngine() const {
-  if (default_search_controlled_by_policy_)
+TemplateURLData* DefaultSearchManager::GetDefaultSearchEngine(
+    Source* source) const {
+  if (default_search_controlled_by_policy_) {
+    if (source)
+      *source = FROM_POLICY;
     return prefs_default_search_.get();
-  if (extension_default_search_)
+  }
+  if (extension_default_search_) {
+    if (source)
+      *source = FROM_EXTENSION;
     return extension_default_search_.get();
-  if (prefs_default_search_)
+  }
+  if (prefs_default_search_) {
+    if (source)
+      *source = FROM_USER;
     return prefs_default_search_.get();
+  }
 
-  return fallback_default_search_.get();
+  if (source)
+    *source = FROM_FALLBACK;
+  return TemplateURLService::FallbackSearchEnginesDisabled()
+             ? NULL
+             : fallback_default_search_.get();
+}
+
+DefaultSearchManager::Source
+DefaultSearchManager::GetDefaultSearchEngineSource() const {
+  Source source;
+  GetDefaultSearchEngine(&source);
+  return source;
 }
 
 void DefaultSearchManager::SetUserSelectedDefaultSearchEngine(
     const TemplateURLData& data) {
+  if (!pref_service_) {
+    prefs_default_search_.reset(new TemplateURLData(data));
+    MergePrefsDataWithPrepopulated();
+    NotifyObserver();
+    return;
+  }
+
   base::DictionaryValue url_dict;
   url_dict.SetString(kID, base::Int64ToString(data.id));
   url_dict.SetString(kShortName, data.short_name);
@@ -162,8 +190,7 @@ void DefaultSearchManager::SetUserSelectedDefaultSearchEngine(
   scoped_ptr<base::ListValue> alternate_urls(new base::ListValue);
   for (std::vector<std::string>::const_iterator it =
            data.alternate_urls.begin();
-       it != data.alternate_urls.end();
-       ++it) {
+       it != data.alternate_urls.end(); ++it) {
     alternate_urls->AppendString(*it);
   }
   url_dict.Set(kAlternateURLs, alternate_urls.release());
@@ -171,8 +198,7 @@ void DefaultSearchManager::SetUserSelectedDefaultSearchEngine(
   scoped_ptr<base::ListValue> encodings(new base::ListValue);
   for (std::vector<std::string>::const_iterator it =
            data.input_encodings.begin();
-       it != data.input_encodings.end();
-       ++it) {
+       it != data.input_encodings.end(); ++it) {
     encodings->AppendString(*it);
   }
   url_dict.Set(kInputEncodings, encodings.release());
@@ -182,44 +208,52 @@ void DefaultSearchManager::SetUserSelectedDefaultSearchEngine(
 
   url_dict.SetBoolean(kCreatedByPolicy, data.created_by_policy);
 
-  pref_service_->Set(kDefaultSearchProviderData, url_dict);
+  pref_service_->Set(kDefaultSearchProviderDataPrefName, url_dict);
 }
 
 void DefaultSearchManager::SetExtensionControlledDefaultSearchEngine(
-    TemplateURLData* data) {
-  extension_default_search_.reset(data);
+    const TemplateURLData& data) {
+  extension_default_search_.reset(new TemplateURLData(data));
+  if (GetDefaultSearchEngineSource() == FROM_EXTENSION)
+    NotifyObserver();
 }
 
 void DefaultSearchManager::ClearExtensionControlledDefaultSearchEngine() {
+  Source old_source = GetDefaultSearchEngineSource();
   extension_default_search_.reset();
+  if (old_source == FROM_EXTENSION)
+    NotifyObserver();
 }
 
 void DefaultSearchManager::ClearUserSelectedDefaultSearchEngine() {
-  pref_service_->ClearPref(kDefaultSearchProviderData);
-}
-
-void DefaultSearchManager::OnDefaultSearchPrefChanged() {
-  TemplateURLData* data;
-  if (ReadDefaultSearchEngineFromPrefs(&data)) {
-    prefs_default_search_.reset(data);
-    MergePrefsDataWithPrepopulated();
+  if (pref_service_) {
+    pref_service_->ClearPref(kDefaultSearchProviderDataPrefName);
   } else {
     prefs_default_search_.reset();
+    NotifyObserver();
   }
-  UpdatePolicyStatus();
 }
 
-void DefaultSearchManager::OnOverridesPrefChanged() {
-  scoped_ptr<TemplateURLData> data =
-      TemplateURLPrepopulateData::GetPrepopulatedDefaultSearch(pref_service_);
-  fallback_default_search_ = data.Pass();
-  MergePrefsDataWithPrepopulated();
+void DefaultSearchManager::OnDefaultSearchPrefChanged() {
+  Source source = GetDefaultSearchEngineSource();
+  LoadDefaultSearchEngineFromPrefs();
+
+  // If we were/are FROM_USER or FROM_POLICY the effective DSE may have changed.
+  if (source != FROM_USER && source != FROM_POLICY)
+    source = GetDefaultSearchEngineSource();
+  if (source == FROM_USER || source == FROM_POLICY)
+      NotifyObserver();
 }
 
-void DefaultSearchManager::UpdatePolicyStatus() {
-  const PrefService::Preference* pref =
-      pref_service_->FindPreference(kDefaultSearchProviderData);
-  default_search_controlled_by_policy_ = pref && pref->IsManaged();
+void DefaultSearchManager::OnOverridesPrefChanged() {
+  LoadPrepopulatedDefaultSearch();
+
+  TemplateURLData* effective_data = GetDefaultSearchEngine(NULL);
+  if (effective_data && effective_data->prepopulate_id) {
+    // A user-selected, policy-selected or fallback pre-populated engine is
+    // active and may have changed with this event.
+    NotifyObserver();
+  }
 }
 
 void DefaultSearchManager::MergePrefsDataWithPrepopulated() {
@@ -251,95 +285,122 @@ void DefaultSearchManager::MergePrefsDataWithPrepopulated() {
   }
 }
 
-bool DefaultSearchManager::ReadDefaultSearchEngineFromPrefs(
-    TemplateURLData** dse_data) {
-  const base::DictionaryValue* url_dict =
-      pref_service_->GetDictionary(kDefaultSearchProviderData);
+void DefaultSearchManager::LoadDefaultSearchEngineFromPrefs() {
+  if (!pref_service_)
+    return;
+
+  prefs_default_search_.reset();
+  default_search_controlled_by_policy_ =
+      IsDefaultSearchProviderManaged(pref_service_);
 
+  const base::DictionaryValue* url_dict =
+      pref_service_->GetDictionary(kDefaultSearchProviderDataPrefName);
   if (url_dict->empty())
-    return false;
+    return;
 
-  bool disabled_by_policy = false;
-  if (url_dict->GetBoolean(kDisabledByPolicy, &disabled_by_policy) &&
-      disabled_by_policy) {
-    *dse_data = NULL;
-    return true;
+  if (default_search_controlled_by_policy_) {
+    bool disabled_by_policy = false;
+    if (url_dict->GetBoolean(kDisabledByPolicy, &disabled_by_policy) &&
+        disabled_by_policy)
+      return;
   }
 
-  TemplateURLData* data = new TemplateURLData();
   std::string search_url;
   base::string16 keyword;
   url_dict->GetString(kURL, &search_url);
   url_dict->GetString(kKeyword, &keyword);
-  if (search_url.empty())
-    return false;
-  if (keyword.empty())
-    keyword = TemplateURLService::GenerateKeyword(GURL(search_url));
-  data->SetKeyword(keyword);
-  data->SetURL(search_url);
+  if (search_url.empty() || keyword.empty())
+    return;
+
+  prefs_default_search_.reset(new TemplateURLData);
+  prefs_default_search_->SetKeyword(keyword);
+  prefs_default_search_->SetURL(search_url);
 
   std::string id;
   url_dict->GetString(kID, &id);
-  base::StringToInt64(id, &data->id);
-  url_dict->GetString(kShortName, &data->short_name);
-  url_dict->GetInteger(kPrepopulateID, &data->prepopulate_id);
-  url_dict->GetString(kSyncGUID, &data->sync_guid);
+  base::StringToInt64(id, &prefs_default_search_->id);
+  url_dict->GetString(kShortName, &prefs_default_search_->short_name);
+  url_dict->GetInteger(kPrepopulateID, &prefs_default_search_->prepopulate_id);
+  url_dict->GetString(kSyncGUID, &prefs_default_search_->sync_guid);
 
-  url_dict->GetString(kSuggestionsURL, &data->suggestions_url);
-  url_dict->GetString(kInstantURL, &data->instant_url);
-  url_dict->GetString(kImageURL, &data->image_url);
-  url_dict->GetString(kNewTabURL, &data->new_tab_url);
+  url_dict->GetString(kSuggestionsURL, &prefs_default_search_->suggestions_url);
+  url_dict->GetString(kInstantURL, &prefs_default_search_->instant_url);
+  url_dict->GetString(kImageURL, &prefs_default_search_->image_url);
+  url_dict->GetString(kNewTabURL, &prefs_default_search_->new_tab_url);
 
   std::string favicon_url;
   std::string originating_url;
   url_dict->GetString(kFaviconURL, &favicon_url);
   url_dict->GetString(kOriginatingURL, &originating_url);
-  data->favicon_url = GURL(favicon_url);
-  data->originating_url = GURL(originating_url);
+  prefs_default_search_->favicon_url = GURL(favicon_url);
+  prefs_default_search_->originating_url = GURL(originating_url);
 
-  url_dict->GetString(kSearchURLPostParams, &data->search_url_post_params);
+  url_dict->GetString(kSearchURLPostParams,
+                      &prefs_default_search_->search_url_post_params);
   url_dict->GetString(kSuggestionsURLPostParams,
-                      &data->suggestions_url_post_params);
-  url_dict->GetString(kInstantURLPostParams, &data->instant_url_post_params);
-  url_dict->GetString(kImageURLPostParams, &data->image_url_post_params);
+                      &prefs_default_search_->suggestions_url_post_params);
+  url_dict->GetString(kInstantURLPostParams,
+                      &prefs_default_search_->instant_url_post_params);
+  url_dict->GetString(kImageURLPostParams,
+                      &prefs_default_search_->image_url_post_params);
 
-  url_dict->GetBoolean(kSafeForAutoReplace, &data->safe_for_autoreplace);
+  url_dict->GetBoolean(kSafeForAutoReplace,
+                       &prefs_default_search_->safe_for_autoreplace);
 
   double date_created = 0.0;
   double last_modified = 0.0;
   url_dict->GetDouble(kDateCreated, &date_created);
   url_dict->GetDouble(kLastModified, &last_modified);
-  data->date_created = base::Time::FromInternalValue(date_created);
-  data->last_modified = base::Time::FromInternalValue(last_modified);
-
-  url_dict->GetInteger(kUsageCount, &data->usage_count);
-
-  const base::ListValue* alternate_urls;
-  url_dict->GetList(kAlternateURLs, &alternate_urls);
-  data->alternate_urls.clear();
-  for (base::ListValue::const_iterator it = alternate_urls->begin();
-       it != alternate_urls->end(); ++it) {
-    std::string alternate_url;
-    if ((*it)->GetAsString(&alternate_url))
-      data->alternate_urls.push_back(alternate_url);
+  prefs_default_search_->date_created =
+      base::Time::FromInternalValue(date_created);
+  prefs_default_search_->last_modified =
+      base::Time::FromInternalValue(last_modified);
+
+  url_dict->GetInteger(kUsageCount, &prefs_default_search_->usage_count);
+
+  const base::ListValue* alternate_urls = NULL;
+  if (url_dict->GetList(kAlternateURLs, &alternate_urls)) {
+    for (base::ListValue::const_iterator it = alternate_urls->begin();
+         it != alternate_urls->end();
+         ++it) {
+      std::string alternate_url;
+      if ((*it)->GetAsString(&alternate_url))
+        prefs_default_search_->alternate_urls.push_back(alternate_url);
+    }
   }
 
-  const base::ListValue* encodings;
-  url_dict->GetList(kInputEncodings, &encodings);
-  data->input_encodings.clear();
-  for (base::ListValue::const_iterator it = encodings->begin();
-       it != encodings->end(); ++it) {
-    std::string encoding;
-    if ((*it)->GetAsString(&encoding))
-      data->input_encodings.push_back(encoding);
+  const base::ListValue* encodings = NULL;
+  if (url_dict->GetList(kInputEncodings, &encodings)) {
+    for (base::ListValue::const_iterator it = encodings->begin();
+         it != encodings->end();
+         ++it) {
+      std::string encoding;
+      if ((*it)->GetAsString(&encoding))
+        prefs_default_search_->input_encodings.push_back(encoding);
+    }
   }
 
   url_dict->GetString(kSearchTermsReplacementKey,
-                      &data->search_terms_replacement_key);
+                      &prefs_default_search_->search_terms_replacement_key);
 
-  url_dict->GetBoolean(kCreatedByPolicy, &data->created_by_policy);
+  url_dict->GetBoolean(kCreatedByPolicy,
+                       &prefs_default_search_->created_by_policy);
+
+  prefs_default_search_->show_in_default_list = true;
+  MergePrefsDataWithPrepopulated();
+}
 
-  data->show_in_default_list = true;
-  *dse_data = data;
-  return true;
+void DefaultSearchManager::LoadPrepopulatedDefaultSearch() {
+  scoped_ptr<TemplateURLData> data =
+     TemplateURLPrepopulateData::GetPrepopulatedDefaultSearch(pref_service_);
+  fallback_default_search_ = data.Pass();
+  MergePrefsDataWithPrepopulated();
+}
+
+void DefaultSearchManager::NotifyObserver() {
+  if (!change_observer_.is_null()) {
+    Source source = FROM_FALLBACK;
+    TemplateURLData* data = GetDefaultSearchEngine(&source);
+    change_observer_.Run(data, source);
+  }
 }