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

chrome/browser/ui/browser_instant_controller.h

 // Copyright 2012 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_UI_BROWSER_INSTANT_CONTROLLER_H_
 #define CHROME_BROWSER_UI_BROWSER_INSTANT_CONTROLLER_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 30 matching lines @@
   // Invoked by |instant_| to get the currently active tab.
   content::WebContents* GetActiveWebContents() const;
 
   // Invoked by |browser_| when the active tab changes.
   void ActiveTabChanged();
 
   // Invoked by |browser_| when the active tab is about to be deactivated.
   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.
   void ReplaceWebContentsAt(int index,
                             scoped_ptr<content::WebContents> new_contents);
 
   Browser* const browser_;
 
   InstantController instant_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserInstantController);
 };
 
 #endif  // CHROME_BROWSER_UI_BROWSER_INSTANT_CONTROLLER_H_