Instant: remove InstantSupportState

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 "base/metrics/user_metrics.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 132 matching lines @@
   instant_.ActiveTabChanged();
 }
 
 void BrowserInstantController::TabDeactivated(content::WebContents* contents) {
   InstantSearchPrerenderer* prerenderer =
       InstantSearchPrerenderer::GetForProfile(profile());
   if (prerenderer)
     prerenderer->Cancel();
 }
 
-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;
+void BrowserInstantController::ModelChanged(const SearchMode& old_mode,
+                                            const SearchMode& new_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_ntp())
+    base::RecordAction(base::UserMetricsAction("InstantExtended.ShowNTP"));
 
-    // 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_ntp())
-      base::RecordAction(base::UserMetricsAction("InstantExtended.ShowNTP"));
-
-    instant_.SearchModeChanged(old_state.mode, new_mode);
-  }
+  instant_.SearchModeChanged(old_mode, new_mode);
 }
 
 void BrowserInstantController::DefaultSearchProviderChanged(
     bool google_base_url_domain_changed) {
   InstantService* instant_service =
       InstantServiceFactory::GetForProfile(profile());
   if (!instant_service)
     return;
 
   TabStripModel* tab_model = browser_->tab_strip_model();
@@ skipping 19 matching lines @@
       params.referrer = content::Referrer();
       params.transition_type = ui::PAGE_TRANSITION_RELOAD;
       contents->GetController().LoadURLWithParams(params);
     } else {
       // Reload the contents to ensure that it gets assigned to a
       // non-privileged renderer.
       TabReloader::Reload(contents);
     }
   }
 }