Rename SetDefaultSearchProvider.

chrome/browser/search_engines/template_url_service.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_service.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/auto_reset.h"
@@ skipping 657 matching lines @@
 }
 
 bool TemplateURLService::CanMakeDefault(const TemplateURL* url) {
   return  !is_default_search_managed() &&
       !IsExtensionControlledDefaultSearch() &&
       (url != GetDefaultSearchProvider()) &&
       url->url_ref().SupportsReplacement() &&
       (url->GetType() == TemplateURL::NORMAL);
 }
 
-void TemplateURLService::SetDefaultSearchProvider(TemplateURL* url) {
-  DCHECK(!is_default_search_managed_);
-  // Omnibox keywords cannot be made default. Extension-controlled search
-  // engines can be made default only by the extension itself because they
-  // aren't persisted.
-  DCHECK(!url || (url->GetType() == TemplateURL::NORMAL));
-
-  // Always persist the setting in the database, that way if the backup
-  // signature has changed out from under us it gets reset correctly.
-  if (SetDefaultSearchProviderNoNotify(url))
-    NotifyObservers();
+void TemplateURLService::SetUserSelectedDefaultSearchProvider(
+    TemplateURL* url) {
+  SetDefaultSearchProvider(url);
 }
 
 TemplateURL* TemplateURLService::GetDefaultSearchProvider() {
   if (loaded_ && !load_failed_)
     return default_search_provider_;
   // We're not loaded, rely on the default search provider stored in prefs.
   return initial_default_search_provider_.get();
 }
 
 bool TemplateURLService::IsSearchResultsPageFromDefaultSearchProvider(
@@ skipping 222 matching lines @@
 
 void TemplateURLService::OnSyncedDefaultSearchProviderGUIDChanged() {
   // Listen for changes to the default search from Sync.
   PrefService* prefs = GetPrefs();
   TemplateURL* new_default_search = GetTemplateURLForGUID(
       prefs->GetString(prefs::kSyncedDefaultSearchProviderGUID));
   if (new_default_search && !is_default_search_managed_) {
     if (new_default_search != GetDefaultSearchProvider()) {
       base::AutoReset<DefaultSearchChangeOrigin> change_origin(
           &dsp_change_origin_, DSP_CHANGE_SYNC_PREF);
-      SetDefaultSearchProvider(new_default_search);
+      SetUserSelectedDefaultSearchProvider(new_default_search);
       pending_synced_default_search_ = false;
     }
   } else {
     // If it's not there, or if default search is currently managed, set a
     // flag to indicate that we waiting on the search engine entry to come
     // in through Sync.
     pending_synced_default_search_ = true;
   }
   UpdateDefaultSearch();
 }
@@ skipping 257 matching lines @@
                              &local_data_map, &merge_result);
     }
   }
 
   // If there is a pending synced default search provider that was processed
   // above, set it now.
   TemplateURL* pending_default = GetPendingSyncedDefaultSearchProvider();
   if (pending_default) {
     base::AutoReset<DefaultSearchChangeOrigin> change_origin(
         &dsp_change_origin_, DSP_CHANGE_SYNC_ADD);
-    SetDefaultSearchProvider(pending_default);
+    SetUserSelectedDefaultSearchProvider(pending_default);
   }
 
   // The remaining SyncData in local_data_map should be everything that needs to
   // be pushed as ADDs to sync.
   for (SyncDataMap::const_iterator iter = local_data_map.begin();
       iter != local_data_map.end(); ++iter) {
     new_changes.push_back(
         syncer::SyncChange(FROM_HERE,
                            syncer::SyncChange::ACTION_ADD,
                            iter->second));
@@ skipping 902 matching lines @@
       base::AutoReset<DefaultSearchChangeOrigin> change_origin(
           &dsp_change_origin_, DSP_CHANGE_SYNC_NOT_MANAGED);
       SetDefaultSearchProviderNoNotify(synced_default);
     } else {
       SetDefaultSearchProviderNoNotify(FindNewDefaultSearchProvider());
     }
   }
   NotifyObservers();
 }
 
+void TemplateURLService::SetDefaultSearchProvider(
+    TemplateURL* url) {
+  DCHECK(!is_default_search_managed_);
+  // Omnibox keywords cannot be made default. Extension-controlled search
+  // engines can be made default only by the extension itself because they
+  // aren't persisted.
+  DCHECK(!url || (url->GetType() == TemplateURL::NORMAL));
+
+  // Always persist the setting in the database, that way if the backup
+  // signature has changed out from under us it gets reset correctly.
+  if (SetDefaultSearchProviderNoNotify(url))
+    NotifyObservers();
+}
+
 bool TemplateURLService::SetDefaultSearchProviderNoNotify(TemplateURL* url) {
   if (url) {
     if (std::find(template_urls_.begin(), template_urls_.end(), url) ==
         template_urls_.end())
       return false;
     // Omnibox keywords cannot be made default.
     DCHECK_NE(TemplateURL::OMNIBOX_API_EXTENSION, url->GetType());
   }
 
   // Only bother reassigning |url| if it has changed. Notice that we don't just
@@ skipping 599 matching lines @@
           new_dse = *i;
           break;
         }
       }
     }
   }
   if (!new_dse)
     new_dse = FindNewDefaultSearchProvider();
   SetDefaultSearchProviderNoNotify(new_dse);
 }