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

chrome/browser/ui/browser_instant_controller.cc

 // 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.
 
 #include "chrome/browser/ui/browser_instant_controller.h"
 
 #include "base/bind.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_web_ui.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/instant_service.h"
 #include "chrome/browser/search/instant_service_factory.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/omnibox/location_bar.h"
 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h"
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
 #include "chrome/browser/ui/search/instant_search_prerenderer.h"
 #include "chrome/browser/ui/search/search_model.h"
 #include "chrome/browser/ui/search/search_tab_helper.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/webui/ntp/app_launcher_handler.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 
-
-// Helpers --------------------------------------------------------------------
+using base::UserMetricsAction;
 
 namespace {
 
 InstantSearchPrerenderer* GetInstantSearchPrerenderer(Profile* profile) {
   DCHECK(profile);
   InstantService* instant_service =
       InstantServiceFactory::GetForProfile(profile);
   return instant_service ? instant_service->instant_search_prerenderer() : NULL;
 }
 
 }  // namespace
 
-
-// BrowserInstantController ---------------------------------------------------
+////////////////////////////////////////////////////////////////////////////////
+// BrowserInstantController, public:
 
 BrowserInstantController::BrowserInstantController(Browser* browser)
     : browser_(browser),
       instant_(this) {
   browser_->search_model()->AddObserver(this);
 
   InstantService* instant_service =
       InstantServiceFactory::GetForProfile(profile());
   instant_service->AddObserver(this);
 }
@@ skipping 58 matching lines @@
 
 void BrowserInstantController::TabDeactivated(content::WebContents* contents) {
   instant_.TabDeactivated(contents);
 
   InstantSearchPrerenderer* prerenderer =
       GetInstantSearchPrerenderer(profile());
   if (prerenderer)
     prerenderer->Cancel();
 }
 
+////////////////////////////////////////////////////////////////////////////////
+// BrowserInstantController, SearchModelObserver implementation:
+
 void BrowserInstantController::ModelChanged(
     const SearchModel::State& old_state,
     const SearchModel::State& new_state) {
   if (old_state.mode != new_state.mode) {
     const SearchMode& new_mode = new_state.mode;
 
     // Record some actions corresponding to the mode change. Note that to get
     // the full story, it's necessary to look at other UMA actions as well,
     // such as tab switches.
     if (new_mode.is_search_results())
-      content::RecordAction(base::UserMetricsAction("InstantExtended.ShowSRP"));
+      content::RecordAction(UserMetricsAction("InstantExtended.ShowSRP"));
     else if (new_mode.is_ntp())
-      content::RecordAction(base::UserMetricsAction("InstantExtended.ShowNTP"));
+      content::RecordAction(UserMetricsAction("InstantExtended.ShowNTP"));
 
     instant_.SearchModeChanged(old_state.mode, new_mode);
   }
 
   if (old_state.instant_support != new_state.instant_support)
     instant_.InstantSupportChanged(new_state.instant_support);
 }
 
+////////////////////////////////////////////////////////////////////////////////
+// BrowserInstantController, InstantServiceObserver implementation:
+
 void BrowserInstantController::DefaultSearchProviderChanged() {
+  ReloadTabsInInstantProcess();
+}
+
+void BrowserInstantController::GoogleURLUpdated() {
+  ReloadTabsInInstantProcess();
+}
+
+void BrowserInstantController::ReloadTabsInInstantProcess() {
   InstantService* instant_service =
       InstantServiceFactory::GetForProfile(profile());
   if (!instant_service)
     return;
 
   TabStripModel* tab_model = browser_->tab_strip_model();
   int count = tab_model->count();
   for (int index = 0; index < count; ++index) {
     content::WebContents* contents = tab_model->GetWebContentsAt(index);
     if (!contents)
       continue;
 
     // Send new search URLs to the renderer.
     content::RenderProcessHost* rph = contents->GetRenderProcessHost();
     instant_service->SendSearchURLsToRenderer(rph);
 
     // Reload the contents to ensure that it gets assigned to a non-priviledged
     // renderer.
     if (!instant_service->IsInstantProcess(rph->GetID()))
       continue;
     contents->GetController().Reload(false);
   }
 }