Move instant support to SearchTabHelper.

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 <iterator>
 
 #include "base/metrics/histogram.h"
 #include "base/strings/string_util.h"
@@ skipping 1230 matching lines @@
   } else if (IsContentsFrom(ntp(), contents)) {
     ntp_->SetDisplayInstantResults(instant_enabled_);
     ntp_->SetOmniboxBounds(omnibox_bounds_);
     ntp_->InitializeFonts();
   } else {
     NOTREACHED();
   }
   UpdateMostVisitedItems();
 }
 
+void InstantController::InstantSupportChanged(
+    const content::WebContents* contents,
+    InstantSupportState instant_support) {
+  if (instant_support == INSTANT_SUPPORT_UNKNOWN)

[samarth, 2013/06/18 22:03:36]

I don't think this is right either because now we never call ResetInstantTab.

I thought about it more and here's what makes the most sense to me:
if (instant_support == INSTANT_SUPPORT_YES)
  ResetInstantTab();

and that's it. I'd also add a comment explaining that the other cases are
already handled by the listener in InstantPage, but that we need to listen for
support becoming YES here because InstantPage is not hooked up to the active tab
in that case.

[kmadhusu, 2013/06/18 23:22:56]

Done.

+    return;
+
+  InstantSupportDetermined(contents, instant_support == INSTANT_SUPPORT_YES);
+}
+
 void InstantController::InstantSupportDetermined(
     const content::WebContents* contents,
     bool supports_instant) {
   if (IsContentsFrom(instant_tab(), contents)) {
     if (!supports_instant)
       base::MessageLoop::current()->DeleteSoon(FROM_HERE,
                                                instant_tab_.release());
 
     content::NotificationService::current()->Notify(
         chrome::NOTIFICATION_INSTANT_TAB_SUPPORT_DETERMINED,
@@ skipping 606 matching lines @@
   result->transition = match.transition;
   result->relevance = match.relevance;
   result->autocomplete_match_index = autocomplete_match_index;
 
   DVLOG(1) << "    " << result->relevance << " "
       << UTF8ToUTF16(AutocompleteMatchType::ToString(result->type)) << " "
       << result->provider << " " << result->destination_url << " '"
       << result->description << "' '" << result->search_query << "' "
       << result->transition <<  " " << result->autocomplete_match_index;
 }