Cleanup in InstantTab and InstantController

chrome/browser/ui/search/instant_tab.h

Index: chrome/browser/ui/search/instant_tab.h
diff --git a/chrome/browser/ui/search/instant_tab.h b/chrome/browser/ui/search/instant_tab.h
index c77f21cfb882d71615bf816e3c76d69361468b59..a5e6f7d811e26530dfd7406f22d97b193b2a1dd4 100644
--- a/chrome/browser/ui/search/instant_tab.h
+++ b/chrome/browser/ui/search/instant_tab.h
@@ -22,7 +22,7 @@ class WebContents;
 // InstantTab is used to exchange messages with a page that implements the
 // Instant/Embedded Search API (http://dev.chromium.org/embeddedsearch).
 class InstantTab : public content::WebContentsObserver,
-                    public SearchModelObserver {
+                   public SearchModelObserver {
  public:
   // InstantTab calls its delegate in response to messages received from the
   // page. Each method is called with the |contents| corresponding to the page
@@ -43,23 +43,11 @@ class InstantTab : public content::WebContentsObserver,
     virtual ~Delegate();
   };
 
-  explicit InstantTab(Delegate* delegate);
-
-  ~InstantTab() override;
-
   // Sets |web_contents| as the page to communicate with. |web_contents| may be
   // NULL, which effectively stops all communication.
-  void Init(content::WebContents* web_contents);

[Marc Treib, 2016/07/21 16:40:09]

Merged into the ctor, no need for two-phase initialization

+  explicit InstantTab(Delegate* delegate, content::WebContents* web_contents);
 
-  // Returns true if the page is known to support the Instant API. This starts
-  // out false, and is set to true whenever we get any message from the page.
-  // Once true, it never becomes false (the page isn't expected to drop API
-  // support suddenly).
-  bool supports_instant() const;

[Marc Treib, 2016/07/21 16:40:09]

This just forwarded to SearchTabHelper, and the lone caller (InstantController)
can just as well use that directly.

-
-  // Returns true if the page is the local NTP (i.e. its URL is
-  // chrome::kChromeSearchLocalNTPURL).
-  bool IsLocal() const;

[Marc Treib, 2016/07/21 16:40:09]

Not used

+  ~InstantTab() override;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(InstantTabTest, IsLocal);