[protector] Refactoring of --no-protector code.

chrome/browser/search_engines/template_url_service.cc

Index: chrome/browser/search_engines/template_url_service.cc
diff --git a/chrome/browser/search_engines/template_url_service.cc b/chrome/browser/search_engines/template_url_service.cc
index abdd54826cf44f6b6152dfdfee7c47c85b4eda7d..c23b18915b815a3561d6dc9ef29afe2faa38727d 100644
--- a/chrome/browser/search_engines/template_url_service.cc
+++ b/chrome/browser/search_engines/template_url_service.cc
@@ -654,7 +654,7 @@ void TemplateURLService::OnWebDataServiceRequestDone(
     UpdateKeywordSearchTermsForURL(visits_to_add_[i]);
   visits_to_add_.clear();
 
-  if (new_resource_keyword_version && service_.get())
+  if (new_resource_keyword_version)
     service_->SetBuiltinKeywordVersion(new_resource_keyword_version);
 
 #if defined(ENABLE_PROTECTOR_SERVICE)
@@ -676,8 +676,7 @@ void TemplateURLService::OnWebDataServiceRequestDone(
       // Protector is turned off: set the current default search to itself
       // to update the backup and sign it. Otherwise, change will be reported
       // every time when keywords are loaded until a search provider is added.
-      // Note that this saves the default search provider to prefs.
-      SetDefaultSearchProviderNoNotify(default_search_provider_);
+      service_->SetDefaultSearchProvider(default_search_provider_);
     }
   }
 #endif