Move instant support to SearchTabHelper.

chrome/browser/ui/search/instant_page.h

Index: chrome/browser/ui/search/instant_page.h
diff --git a/chrome/browser/ui/search/instant_page.h b/chrome/browser/ui/search/instant_page.h
index 5edf008da7b97b32ce9d70150e9217bd6429415b..d42ab2ab7862c8f09993c4020f6c957c4bfbc010 100644
--- a/chrome/browser/ui/search/instant_page.h
+++ b/chrome/browser/ui/search/instant_page.h
@@ -10,6 +10,7 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/string16.h"
+#include "chrome/browser/ui/search/search_model_observer.h"
 #include "chrome/common/instant_types.h"
 #include "chrome/common/omnibox_focus_state.h"
 #include "content/public/browser/web_contents_observer.h"
@@ -31,7 +32,8 @@ class Rect;
 // Instant/Embedded Search API (http://dev.chromium.org/embeddedsearch).
 // InstantPage is not used directly but via one of its derived classes:
 // InstantOverlay, InstantNTP and InstantTab.
-class InstantPage : public content::WebContentsObserver {
+class InstantPage : public content::WebContentsObserver,
+                    public SearchModelObserver {
  public:
   // InstantPage calls its delegate in response to messages received from the
   // page. Each method is called with the |contents| corresponding to the page
@@ -155,10 +157,6 @@ class InstantPage : public content::WebContentsObserver {
   // Tells the page about the font information.
   void InitializeFonts();
 
-  // Tells the renderer to determine if the page supports the Instant API, which
-  // results in a call to InstantSupportDetermined() when the reply is received.
-  void DetermineIfPageSupportsInstant();
-
   // Tells the page about the available autocomplete results.
   void SendAutocompleteResults(
       const std::vector<InstantAutocompleteResult>& results);
@@ -216,11 +214,6 @@ class InstantPage : public content::WebContentsObserver {
   // Overridden from content::WebContentsObserver:
   virtual void RenderViewCreated(
       content::RenderViewHost* render_view_host) OVERRIDE;
-  virtual void DidFinishLoad(
-      int64 frame_id,
-      const GURL& validated_url,
-      bool is_main_frame,
-      content::RenderViewHost* render_view_host) OVERRIDE;
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
   virtual void RenderViewGone(base::TerminationStatus status) OVERRIDE;
   virtual void DidCommitProvisionalLoadForFrame(
@@ -240,9 +233,18 @@ class InstantPage : public content::WebContentsObserver {
       const string16& error_description,
       content::RenderViewHost* render_view_host) OVERRIDE;
 
+  // Overridden from SearchModelObserver:
+  virtual void ModelChanged(const SearchModel::State& old_state,
+                            const SearchModel::State& new_state) OVERRIDE;
+
+  // Helper to look up the SearchModel for this page.
+  SearchModel* GetSearchModel();
+
+  // Update the status of Instant support.
+  void SetSupportsInstant(bool supports_instant);
+
   void OnSetSuggestions(int page_id,
                         const std::vector<InstantSuggestion>& suggestions);
-  void OnInstantSupportDetermined(int page_id, bool supports_instant);
   void OnShowInstantOverlay(int page_id,
                             int height,
                             InstantSizeUnits units);
@@ -257,6 +259,7 @@ class InstantPage : public content::WebContentsObserver {
 
   Delegate* const delegate_;
   const std::string instant_url_;
+  const bool extended_enabled_;
   bool supports_instant_;
   bool instant_support_determined_;

[samarth, 2013/05/10 01:32:38]

Is this necessary anymore?

[kmadhusu, 2013/05/13 17:13:24]

Removed. Fixed interactive_ui_tests to use supports_instant() instead of
instant_support_determined() .