Added Protector, hooked up DSE verification with error bubble.

chrome/browser/search_engines/template_url_service.cc

 // Copyright (c) 2011 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"
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_service.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/net/url_fixer_upper.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/pref_set_observer.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/protector/protector.h"
+#include "chrome/browser/protector/setting_change.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_service_observer.h"
 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
 #include "chrome/browser/search_engines/util.h"
 #include "chrome/browser/sync/api/sync_change.h"
 #include "chrome/browser/sync/protocol/search_engine_specifics.pb.h"
 #include "chrome/common/chrome_notification_types.h"
@@ skipping 394 matching lines @@
       url->url() &&
       url->url()->SupportsReplacement() &&
       !is_default_search_managed();
 }
 
 void TemplateURLService::SetDefaultSearchProvider(const TemplateURL* url) {
   if (is_default_search_managed_) {
     NOTREACHED();
     return;
   }
-  if (default_search_provider_ == url)
-    return;
+  // We must always persist the setting in the database since we have to

[sky, 2011/10/24 17:23:21]

How about changing this comment to:
Always persist the setting in the database, that way if the backup signature has
changed out from under us it gets reset correctly.

[whywhat, 2011/10/25 10:30:41]

Done.

+  // sync backup and its signature with the setting. So the cached default
+  // search engine provider could be equal to |url| but its backup and
+  // signature might be missing or corrupted. We don't need to send
+  // notifications out each time, however.
   SetDefaultSearchProviderNoNotify(url);
-  NotifyObservers();
+  if (default_search_provider_ != url)
+    NotifyObservers();
 }
 
 const TemplateURL* TemplateURLService::GetDefaultSearchProvider() {
   if (loaded_ && !load_failed_)
     return default_search_provider_;
 
   // We're not loaded, rely on the default search provider stored in prefs.
   return initial_default_search_provider_.get();
 }
 
+const TemplateURL* TemplateURLService::FindNewDefaultSearchProvider() {
+  // See if the prepoluated default still exists.
+  scoped_ptr<TemplateURL> prepopulated_default(
+      TemplateURLPrepopulateData::GetPrepopulatedDefaultSearch(GetPrefs()));
+  for (TemplateURLVector::iterator i = template_urls_.begin();
+      i != template_urls_.end(); ) {
+    if ((*i)->prepopulate_id() == prepopulated_default->prepopulate_id())
+      return *i;
+  }
+  // If not, use the first of the templates.
+  if (!template_urls_.empty()) {

[sky, 2011/10/24 17:04:13]

change this to:
return template_urls_.empty() ? NULL : ...

[whywhat, 2011/10/25 10:30:41]

Done.

+    return template_urls_[0];
+  }
+  return NULL;
+}
+
 void TemplateURLService::AddObserver(TemplateURLServiceObserver* observer) {
   model_observers_.AddObserver(observer);
 }
 
 void TemplateURLService::RemoveObserver(TemplateURLServiceObserver* observer) {
   model_observers_.RemoveObserver(observer);
 }
 
 void TemplateURLService::Load() {
   if (loaded_ || load_handle_)
@@ skipping 41 matching lines @@
                                        &default_search_provider,
                                        &new_resource_keyword_version);
 
   bool database_specified_a_default = NULL != default_search_provider;
 
   // 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 and notify
+  // Protector instance about it. Don't check if the default search is
+  // managed.
+  const TemplateURL* backup_default_search_provider = NULL;
+  if (!is_default_search_managed_ &&
+      DidDefaultSearchProviderChange(
+          *result,
+          template_urls,
+          &backup_default_search_provider)) {
+    // Protector will delete itself when it's needed no longer.
+    protector::Protector* protector = new protector::Protector(profile());
+    protector->ShowChange(protector::CreateDefaultSearchProviderChange(
+        default_search_provider,
+        backup_default_search_provider));
+  }
+
   // 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());
 
   if (is_default_search_managed_) {
     SetTemplateURLs(template_urls);
 
     if (TemplateURLsHaveSamePrefs(default_search_provider,
@@ skipping 923 matching lines @@
         default_search_provider_->created_by_policy()) {
       const TemplateURL* old_default = default_search_provider_;
       default_search_provider_ = NULL;
       RemoveNoNotify(old_default);
     }
     SetDefaultSearchProviderNoNotify(FindNewDefaultSearchProvider());
   }
   NotifyObservers();
 }
 
-const TemplateURL* TemplateURLService::FindNewDefaultSearchProvider() {
-  // See if the prepoluated default still exists.
-  scoped_ptr<TemplateURL> prepopulated_default(
-      TemplateURLPrepopulateData::GetPrepopulatedDefaultSearch(GetPrefs()));
-  for (TemplateURLVector::iterator i = template_urls_.begin();
-      i != template_urls_.end(); ) {
-    if ((*i)->prepopulate_id() == prepopulated_default->prepopulate_id())
-      return *i;
-  }
-  // If not, use the first of the templates.
-  if (!template_urls_.empty()) {
-    return template_urls_[0];
-  }
-  return NULL;
-}
-
 void TemplateURLService::SetDefaultSearchProviderNoNotify(
     const TemplateURL* url) {
   DCHECK(!url || find(template_urls_.begin(), template_urls_.end(), url) !=
          template_urls_.end());
   default_search_provider_ = url;
 
   if (url) {
     TemplateURL* modifiable_url = const_cast<TemplateURL*>(url);
     // Don't mark the url as edited, otherwise we won't be able to rev the
     // template urls we ship with.
@@ skipping 231 matching lines @@
   } else {
     // Change the local TURL's GUID to the server's GUID and push an update to
     // Sync. This ensures that the rest of local_url's fields are sync'd up to
     // the server, and the next time local_url is synced, it is recognized by
     // having the same GUID.
     ResetTemplateURLGUID(local_turl, sync_turl->sync_guid());
     SyncData sync_data = CreateSyncDataFromTemplateURL(*local_turl);
     change_list->push_back(SyncChange(SyncChange::ACTION_UPDATE, sync_data));
   }
 }