Handle TemplateURLService load failure better, and make some test correctness fixes that will be ne…

chrome/browser/search/instant_service_observer.h

 // Copyright 2013 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_INSTANT_SERVICE_OBSERVER_H_
 #define CHROME_BROWSER_SEARCH_INSTANT_SERVICE_OBSERVER_H_
 
 #include <vector>
 
 struct InstantMostVisitedItem;
 struct ThemeBackgroundInfo;
 
 // InstantServiceObserver defines the observer interface for InstantService.
 class InstantServiceObserver {
  public:
   // Indicates that the user's custom theme has changed in some way.
   virtual void ThemeInfoChanged(const ThemeBackgroundInfo&);
 
   // Indicates that the most visited items has changed.
   virtual void MostVisitedItemsChanged(
       const std::vector<InstantMostVisitedItem>&);
 
   // Indicates that the default search provider changed.
   virtual void DefaultSearchProviderChanged();
 
-  // Indicates that the Google URL has changed as a result of searchdomaincheck.
-  // Note that the search domain change triggers a yellow infobar at the top of
-  // the page, and the actual change is triggered after the user accepts.
-  virtual void GoogleURLUpdated();
-
   // Indicates that the omnibox start margin has changed.
   virtual void OmniboxStartMarginChanged(int omnibox_start_margin);
 
  protected:
   virtual ~InstantServiceObserver() {}
 };
 
 #endif  // CHROME_BROWSER_SEARCH_INSTANT_SERVICE_OBSERVER_H_