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 400 matching lines @@
   if (is_default_search_managed_) {
     NOTREACHED();
     return;
   }
   if (default_search_provider_ == url)
     return;
   SetDefaultSearchProviderNoNotify(url);
   NotifyObservers();
 }
 
+void TemplateURLService::ForceSetDefaultSearchProvider(

[sky, 2011/10/21 21:34:11]

Having to expose a method like this is icky. Can you instead set it to NULL then
to what you want.

[whywhat, 2011/10/24 15:30:17]

Done.
I think using the fact that setting dsp to NULL and then to something else will
force save to db is also leak of abstraction here. Perhaps smth like
WebDataService or KeywordTable should cache backup and signature and decide
whether to set value in db or not while TemplateURLService should not check for
equality for dsp. 

+    const TemplateURL* url) {
+  if (is_default_search_managed_) {
+    NOTREACHED();
+    return;
+  }
+  SetDefaultSearchProviderNoNotify(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();
 }
 
 void TemplateURLService::AddObserver(TemplateURLServiceObserver* observer) {
   model_observers_.AddObserver(observer);
@@ skipping 44 matching lines @@
   int new_resource_keyword_version = 0;
   GetSearchProvidersUsingKeywordResult(*result,
                                        service_.get(),
                                        GetPrefs(),
                                        &template_urls,
                                        &default_search_provider,
                                        &new_resource_keyword_version);
 
   bool database_specified_a_default = NULL != default_search_provider;
 
+  // Check if the default search provider has been changed and notify
+  // Protector instance about it.
+  const TemplateURL* backup_default_search_provider = NULL;
+  if (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,

[sky, 2011/10/21 21:34:11]

Should we ignore this if managed?

Protector seems to be caching the TemplateURLs directly. There is nothing
stopping the TemplateURLService from deleting these. Either the protector should
observe the method and deal with the items being deleted, or cache the
information it needs in the constructor and not hold onto the TemplateURLs.

[whywhat, 2011/10/24 15:30:17]

Done.

+        backup_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_);
 
   // 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());
@@ skipping 1195 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));
   }
 }