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

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 "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/i18n/case_conversion.h"
@@ skipping 636 matching lines @@
 
   // This initializes provider_map_ which should be done before
   // calling UpdateKeywordSearchTermsForURL.
   ChangeToLoadedState();
 
   // Index any visits that occurred before we finished loading.
   for (size_t i = 0; i < visits_to_add_.size(); ++i)
     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)
   // Don't do anything if the default search provider has been changed since the
   // check at the beginning (overridden by Sync).
   if (is_default_search_hijacked &&
       default_search_provider_ == hijacked_default_search_provider) {
     // The histograms should be reported even when Protector is disabled.
     scoped_ptr<protector::BaseSettingChange> change(
         protector::CreateDefaultSearchProviderChange(
             hijacked_default_search_provider,
             backup_default_search_provider.release()));
     if (protector::IsEnabled()) {
       protector::ProtectorService* protector_service =
           protector::ProtectorServiceFactory::GetForProfile(profile());
       DCHECK(protector_service);
       protector_service->ShowChange(change.release());
     } else {
       // 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
 
   if (!is_default_search_managed_) {
     UMA_HISTOGRAM_BOOLEAN("Search.HasDefaultSearchProvider",
                           default_search_provider_ != NULL);
     // Ensure that default search provider exists. See http://crbug.com/116952.
     if (!default_search_provider_)
       SetDefaultSearchProviderNoNotify(FindNewDefaultSearchProvider());
@@ skipping 1280 matching lines @@
     // TODO(mpcomplete): If we allow editing extension keywords, then those
     // should be persisted to disk and synced.
     if (template_url->sync_guid().empty() &&
         !template_url->IsExtensionKeyword()) {
       template_url->data_.sync_guid = guid::GenerateGUID();
       if (service_.get())
         service_->UpdateKeyword(*template_url);
     }
   }
 }