Remove InstantController::InstantSupportChanged

chrome/browser/ui/search/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/search/instant_controller.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/location.h"
@@ skipping 44 matching lines @@
       base::Time::Now().ToInternalValue(), info));
   static const size_t kMaxDebugEventSize = 2000;
   if (debug_events_.size() > kMaxDebugEventSize)
     debug_events_.pop_back();
 }
 
 void InstantController::ClearDebugEvents() {
   debug_events_.clear();
 }
 
-void InstantController::InstantSupportChanged(
-    InstantSupportState instant_support) {
-  // Handle INSTANT_SUPPORT_YES here because InstantTab is not hooked up to the
-  // active tab. Search model changed listener in InstantTab will handle other
-  // cases.
-  if (instant_support != INSTANT_SUPPORT_YES)
-    return;
-
-  ResetInstantTab();
-}
-
 void InstantController::InstantTabAboutToNavigateMainFrame(
     const content::WebContents* contents,
     const GURL& url) {
   DCHECK(IsContentsFrom(instant_tab_.get(), contents));
 
   // The Instant tab navigated.  Send it the data it needs to display
   // properly.
+  // TODO(treib): Doesn't seem to be necessary. crbug.com/627747
   UpdateInfoForInstantTab();
 }
 
 void InstantController::ResetInstantTab() {
   if (search_mode_.is_origin_ntp()) {
     content::WebContents* active_tab = browser_->GetActiveWebContents();
     if (!instant_tab_ || active_tab != instant_tab_->web_contents()) {
       instant_tab_.reset(new InstantTab(this, active_tab));
       instant_tab_->Init();
       UpdateInfoForInstantTab();
     }
   } else {
     instant_tab_.reset();
   }
 }
 
 void InstantController::UpdateInfoForInstantTab() {
-  if (instant_tab_) {
-    // Update theme details.
-    InstantService* instant_service = GetInstantService();
-    if (instant_service) {
-      instant_service->UpdateThemeInfo();
-      instant_service->UpdateMostVisitedItemsInfo();
-    }
+  DCHECK(instant_tab_);
+  InstantService* instant_service = GetInstantService();
+  if (instant_service) {
+    instant_service->UpdateThemeInfo();
+    instant_service->UpdateMostVisitedItemsInfo();
   }
 }
 
 InstantService* InstantController::GetInstantService() const {
   return InstantServiceFactory::GetForProfile(browser_->profile());
 }