Replace manual GoogleURLTracker update request with call to utility function.

components/search_engines/template_url_service.cc

 // Copyright 2014 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 "components/search_engines/template_url_service.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/auto_reset.h"
@@ skipping 653 matching lines @@
        i < actions.added_engines.end();
        ++i) {
     AddNoNotify(base::MakeUnique<TemplateURL>(*i), true);
   }
 
   base::AutoReset<DefaultSearchChangeOrigin> change_origin(
       &dsp_change_origin_, DSP_CHANGE_PROFILE_RESET);
 
   default_search_manager_.ClearUserSelectedDefaultSearchEngine();
 
-  if (!default_search_provider_) {
-    // If the default search provider came from a user pref we would have been
-    // notified of the new (fallback-provided) value in
-    // ClearUserSelectedDefaultSearchEngine() above. Since we are here, the
-    // value was presumably originally a fallback value (which may have been
-    // repaired).
-    DefaultSearchManager::Source source;
-    const TemplateURLData* new_dse =
-        default_search_manager_.GetDefaultSearchEngine(&source);
-    // ApplyDefaultSearchChange will notify observers once it is done.
-    ApplyDefaultSearchChange(new_dse, source);
-  } else {
+  if (default_search_provider_) {
     // Set fallback engine as user selected, because repair is considered a user
     // action and we are expected to sync new fallback engine to other devices.
     const TemplateURLData* fallback_engine_data =
         default_search_manager_.GetFallbackSearchEngine();
     if (fallback_engine_data) {
       TemplateURL* fallback_engine =
           FindPrepopulatedTemplateURL(fallback_engine_data->prepopulate_id);
       // The fallback engine is created from built-in/override data that should
       // always have a prepopulate ID, so this engine should always exist after
       // a repair.
       DCHECK(fallback_engine);
       // Write the fallback engine's GUID to prefs, which will cause
       // OnSyncedDefaultSearchProviderGUIDChanged() to set it as the new
       // user-selected engine.
       prefs_->SetString(prefs::kSyncedDefaultSearchProviderGUID,
                         fallback_engine->sync_guid());
     }
     NotifyObservers();
+    RequestGoogleURLTrackerServerCheckIfNecessary();
+  } else {
+    // If the default search provider came from a user pref we would have been
+    // notified of the new (fallback-provided) value in
+    // ClearUserSelectedDefaultSearchEngine() above. Since we are here, the
+    // value was presumably originally a fallback value (which may have been
+    // repaired).
+    DefaultSearchManager::Source source;
+    const TemplateURLData* new_dse =
+        default_search_manager_.GetDefaultSearchEngine(&source);
+    // ApplyDefaultSearchChange will notify observers once it is done.
+    ApplyDefaultSearchChange(new_dse, source);
   }
 }
 
 void TemplateURLService::AddObserver(TemplateURLServiceObserver* observer) {
   model_observers_.AddObserver(observer);
 }
 
 void TemplateURLService::RemoveObserver(TemplateURLServiceObserver* observer) {
   model_observers_.RemoveObserver(observer);
 }
@@ skipping 1127 matching lines @@
 
   // Synthesize a visit for the keyword. This ensures the url for the keyword is
   // autocompleted even if the user doesn't type the url in directly.
   client_->AddKeywordGeneratedVisit(url);
 }
 
 void TemplateURLService::RequestGoogleURLTrackerServerCheckIfNecessary() {
   if (default_search_provider_ &&
       default_search_provider_->HasGoogleBaseURLs(search_terms_data()) &&
       google_url_tracker_)
-    google_url_tracker_->RequestServerCheck(false);
+    google_url_tracker_->RequestServerCheck();
 }
 
 void TemplateURLService::GoogleBaseURLChanged() {
   if (!loaded_) {
     if (initial_default_search_provider_.get() &&
         initial_default_search_provider_->HasGoogleBaseURLs(
             search_terms_data())) {
       initial_default_search_provider_->InvalidateCachedValues();
       initial_default_search_provider_->ResetKeywordIfNecessary(
           search_terms_data(), false);
@@ skipping 652 matching lines @@
       if (keyword_to_template_url.find(template_url->keyword()) !=
           keyword_to_template_url.end()) {
         return true;
       }
       keyword_to_template_url[template_url->keyword()] = template_url.get();
     }
   }
   return false;
 }
 #endif