[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 654 matching lines @@
     // 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 {
+    } else if (service_.get()) {

[sky, 2012/04/13 15:56:22]

I don't think it's possible for service_ to be NULL here. Maybe I'm missing
something?

[Ivan Korotkov, 2012/04/13 17:19:10]

You're right apparently. I was confused by another check for service_.get() in
this function above. I guess it makes sense to remove it as well?

[sky, 2012/04/13 21:33:39]

yes

[Ivan Korotkov, 2012/04/13 22:06:32]

Done.

       // 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);
     }
   }
 }