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"
@@ skipping 88 matching lines @@
         (elem1.first < elem2.first);
   }
 };
 
 TemplateURLService::TemplateURLService(Profile* profile)
     : profile_(profile),
       loaded_(false),
       load_failed_(false),
       load_handle_(0),
       default_search_provider_(NULL),
+      backup_default_search_provider_(NULL),
+      is_default_search_provider_verified_(false),
       is_default_search_managed_(false),
       next_id_(1),
       time_provider_(&base::Time::Now),
       models_associated_(false),
       processing_syncer_changes_(false),
       sync_processor_(NULL) {
   DCHECK(profile_);
   Init(NULL, 0);
 }
 
 TemplateURLService::TemplateURLService(const Initializer* initializers,
                                        const int count)
     : profile_(NULL),
       loaded_(false),
       load_failed_(false),
       load_handle_(0),
       service_(NULL),
       default_search_provider_(NULL),
+      backup_default_search_provider_(NULL),
+      is_default_search_provider_verified_(false),
       is_default_search_managed_(false),
       next_id_(1),
       time_provider_(&base::Time::Now),
       models_associated_(false),
       processing_syncer_changes_(false),
       sync_processor_(NULL) {
   Init(initializers, count);
 }
 
 TemplateURLService::~TemplateURLService() {
@@ skipping 306 matching lines @@
 }
 
 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::SetVerifiedDefaultSearchProvider(
+    const TemplateURL* url) {
+  if (is_default_search_managed_) {
+    NOTREACHED();
+    return;
+  }
+  if (default_search_provider_ == url &&
+      backup_default_search_provider_ == url &&
+      is_default_search_provider_verified_)
+    return;
+  SetDefaultSearchProviderNoNotify(url);
+  backup_default_search_provider_ = url;
+  is_default_search_provider_verified_ = true;
+  NotifyObservers();
+}
+
 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 36 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;
 
+  backup_default_search_provider_ = NULL;
+  is_default_search_provider_verified_ =
+      VerifyDefaultSearchProviderUsingKeywordResult(
+          *result,
+          template_urls,
+          &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));
   }
 }