Added Protector, hooked up DSE verification with error bubble.

chrome/browser/search_engines/template_url_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_H_
 #define CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_H_
 #pragma once
 
 #include <map>
 #include <set>
@@ skipping 181 matching lines @@
   // This will assert if the default search is managed; the UI should not be
   // invoking this method in that situation.
   void SetDefaultSearchProvider(const TemplateURL* url);
 
   // Returns the default search provider. If the TemplateURLService hasn't been
   // loaded, the default search provider is pulled from preferences.
   //
   // NOTE: At least in unittest mode, this may return NULL.
   const TemplateURL* GetDefaultSearchProvider();
 
+  // Sets the backup and marks the default search provider as verified.
+  // |url| may be null.
+  // This will assert if the default search is managed; the UI should not be
+  // invoking this method in that situation.
+  void SetVerifiedDefaultSearchProvider(const TemplateURL* url);
+
+  // Returns the backup for the default search provider. If verification of
+  // the backup failed, returns NULL.
+  const TemplateURL* backup_default_search_provider() const {
+    return backup_default_search_provider_;
+  };
+
+  // Indicates if the default search provider was successfully verified on
+  // the last load.
+  bool is_default_search_provider_verified() const {
+    return is_default_search_provider_verified_;
+  }
+
   // Returns true if the default search is managed through group policy.
   bool is_default_search_managed() const { return is_default_search_managed_; }
 
   // Observers used to listen for changes to the model.
   // TemplateURLService does NOT delete the observers when deleted.
   void AddObserver(TemplateURLServiceObserver* observer);
   void RemoveObserver(TemplateURLServiceObserver* observer);
 
   // Loads the keywords. This has no effect if the keywords have already been
   // loaded.
@@ skipping 316 matching lines @@
   scoped_refptr<WebDataService> service_;
 
   // All visits that occurred before we finished loading. Once loaded
   // UpdateKeywordSearchTermsForURL is invoked for each element of the vector.
   std::vector<history::URLVisitedDetails> visits_to_add_;
 
   // Once loaded, the default search provider.  This is a pointer to a
   // TemplateURL owned by template_urls_.
   const TemplateURL* default_search_provider_;
 
+  // Once loaded, the backup default search provider.
+  // This is a pointer to a TemplateURL owned by template_urls_.
+  const TemplateURL* backup_default_search_provider_;

[sky, 2011/10/21 17:20:30]

I don't like persisting this and is_default_search_provider_verified. Can't
TemplateURLService::OnWebDataServiceRequestDone call off to the protector and
let the protected do whatever it wants.

[whywhat, 2011/10/21 20:31:53]

Done.

+
+  // Indicates if the default search provider was verified successfully.
+  bool is_default_search_provider_verified_;
+
   // Used for UX testing. Gives the slot in the search engine dialog that was
   // chosen as the default search engine.
   int search_engine_dialog_chosen_slot_;
 
   // The initial search provider extracted from preferences. This is only valid
   // if we haven't been loaded or loading failed.
   scoped_ptr<TemplateURL> initial_default_search_provider_;
 
   // Whether the default search is managed via policy.
   bool is_default_search_managed_;
@@ skipping 22 matching lines @@
   // true, we ignore any local search engine changes, since we triggered them.
   bool processing_syncer_changes_;
 
   // Sync's SyncChange handler. We push all our changes through this.
   SyncChangeProcessor* sync_processor_;
 
   DISALLOW_COPY_AND_ASSIGN(TemplateURLService);
 };
 
 #endif  // CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_H_