Remove the protector service.

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/compiler_specific.h"
 #include "base/environment.h"
 #include "base/guid.h"
 #include "base/i18n/case_conversion.h"
 #include "base/metrics/histogram.h"
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/google/google_url_tracker.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/history_notifications.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/protector/base_setting_change.h"
-#include "chrome/browser/protector/protector_service.h"
-#include "chrome/browser/protector/protector_service_factory.h"
-#include "chrome/browser/protector/protector_utils.h"
 #include "chrome/browser/rlz/rlz.h"
 #include "chrome/browser/search_engines/search_host_to_urls_map.h"
 #include "chrome/browser/search_engines/search_terms_data.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
 #include "chrome/browser/search_engines/template_url_service_observer.h"
 #include "chrome/browser/search_engines/util.h"
 #include "chrome/browser/webdata/web_data_service_factory.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
@@ skipping 693 matching lines @@
       &template_urls, &default_search_provider, &new_resource_keyword_version,
       &pre_sync_deletes_);
 
   bool database_specified_a_default = (default_search_provider != NULL);
 
   // Check if default search provider is now managed.
   scoped_ptr<TemplateURL> default_from_prefs;
   LoadDefaultSearchProviderFromPrefs(&default_from_prefs,
                                      &is_default_search_managed_);
 
-  // Check if the default search provider has been changed in Web Data by
-  // another program. No immediate action is performed because the default
-  // search may be changed below by Sync which effectively undoes the hijacking.
-  bool is_default_search_hijacked = false;
-  TemplateURL* hijacked_default_search_provider = NULL;
-  scoped_ptr<TemplateURL> backup_default_search_provider;
-  // No check is required if the default search is managed.
-  // |DidDefaultSearchProviderChange| must always be called because it will
-  // take care of the unowned backup default search provider instance.
-  if (DidDefaultSearchProviderChange(*result, profile_,
-                                     &backup_default_search_provider) &&
-      !is_default_search_managed_) {
-    hijacked_default_search_provider = default_search_provider;
-    is_default_search_hijacked = true;
-  }
-
   // Remove entries that were created because of policy as they may have
   // changed since the database was saved.
   RemoveProvidersCreatedByPolicy(&template_urls,
                                  &default_search_provider,
                                  default_from_prefs.get());
 
   PatchMissingSyncGUIDs(&template_urls);
 
   if (is_default_search_managed_) {
     SetTemplateURLs(template_urls);
@@ skipping 61 matching lines @@
   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_->SetBuiltinKeywordVersion(new_resource_keyword_version);
 
-  bool check_if_default_search_valid = !is_default_search_managed_;
-
-  // 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) {
-    // Put the #if defined(ENABLE_PROTECTOR_SERVICE) inside the 'if' block to
-    // avoid 'unused-but-set-variable' error.
-#if defined(ENABLE_PROTECTOR_SERVICE)
-    // 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.
-      service_->SetDefaultSearchProvider(default_search_provider_);
-    }
-    // The default search provider sanity check makes no sense in this case
-    // because ProtectorService is going to change default search eventually.
-    check_if_default_search_valid = false;
-#endif
-  }
-
-  if (check_if_default_search_valid) {
+  if (!is_default_search_managed_) {
     bool has_default_search_provider = default_search_provider_ != NULL &&
         default_search_provider_->SupportsReplacement();
     UMA_HISTOGRAM_BOOLEAN("Search.HasDefaultSearchProvider",
                           has_default_search_provider);
     // Ensure that default search provider exists. See http://crbug.com/116952.
     if (!has_default_search_provider) {
       bool success =
           SetDefaultSearchProviderNoNotify(FindNewDefaultSearchProvider());
       DCHECK(success);
     }
@@ skipping 1678 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 = base::GenerateGUID();
       if (service_.get())
         service_->UpdateKeyword(template_url->data());
     }
   }
 }