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

chrome/browser/ui/browser_instant_controller.h

Index: chrome/browser/ui/browser_instant_controller.h
diff --git a/chrome/browser/ui/browser_instant_controller.h b/chrome/browser/ui/browser_instant_controller.h
index d9c70ca0041c9b01e1e0f673c3e14f7e3b1041ae..3953c69f4d72882b5f7e9e744698adef41bda88f 100644
--- a/chrome/browser/ui/browser_instant_controller.h
+++ b/chrome/browser/ui/browser_instant_controller.h
@@ -48,17 +48,12 @@ class BrowserInstantController : public SearchModelObserver,
   void TabDeactivated(content::WebContents* contents);
 
  private:
-  // Overridden from search::SearchModelObserver:
+  // SearchModelObserver:
   virtual void ModelChanged(const SearchModel::State& old_state,
                             const SearchModel::State& new_state) OVERRIDE;
 
-  // Overridden from InstantServiceObserver:
+  // InstantServiceObserver:
   virtual void DefaultSearchProviderChanged() OVERRIDE;
-  virtual void GoogleURLUpdated() OVERRIDE;
-
-  // Reloads the tabs in instant process to ensure that their privileged status

[Jered, 2014/05/08 20:20:05]

This comment is useful because it describes why we're doing the work this method
does. Keep it in the .cc file?

[erikwright (departed), 2014/05/08 20:52:59]

Done.

-  // is still valid.
-  void ReloadTabsInInstantProcess();
 
   // Replaces the contents at tab |index| with |new_contents| and deletes the
   // existing contents.