Implement SearchTabHelperDelegate.

chrome/browser/ui/browser.h

Index: chrome/browser/ui/browser.h
diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
index 2544bfc8f8f3ac38ed7c2e2bf9e64780ab84206a..42cb004dbeb4a953151057209e7c06cdc599bcfb 100644
--- a/chrome/browser/ui/browser.h
+++ b/chrome/browser/ui/browser.h
@@ -25,6 +25,7 @@
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/chrome_web_modal_dialog_manager_delegate.h"
 #include "chrome/browser/ui/host_desktop.h"
+#include "chrome/browser/ui/search/search_tab_helper_delegate.h"
 #include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h"
 #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h"
 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
@@ -32,6 +33,7 @@
 #include "chrome/browser/ui/zoom/zoom_observer.h"
 #include "chrome/common/content_settings.h"
 #include "chrome/common/content_settings_types.h"
+#include "chrome/common/instant_types.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/page_navigator.h"
@@ -97,6 +99,7 @@ class Browser : public TabStripModelObserver,
                 public content::WebContentsDelegate,
                 public CoreTabHelperDelegate,
                 public SearchEngineTabHelperDelegate,
+                public SearchTabHelperDelegate,

[Jered, 2014/04/04 22:39:27]

(no action required) Ugh what is a HelperDelegate? Who comes up with these
names?

[kmadhusu, 2014/04/07 21:44:15]

If you prefer, we can rename this to "SearchTabDelegate". WDYT?

[Jered, 2014/04/08 12:32:10]

I guess it is the delegate of SearchTabHelper, so it is fine as it is. I'll just
have to live with it. :)

                 public ChromeWebModalDialogManagerDelegate,
                 public BookmarkTabHelperDelegate,
                 public ZoomObserver,
@@ -353,11 +356,6 @@ class Browser : public TabStripModelObserver,
   // Invoked when visible SSL state (as defined by SSLStatus) changes.
   void VisibleSSLStateChanged(content::WebContents* web_contents);
 
-  // Invoked when the |web_contents| no longer supports Instant. Refreshes the
-  // omnibox so it no longer shows search terms.
-  void OnWebContentsInstantSupportDisabled(
-      const content::WebContents* web_contents);
-
   // Assorted browser commands ////////////////////////////////////////////////
 
   // NOTE: Within each of the following sections, the IDs are ordered roughly by
@@ -662,6 +660,17 @@ class Browser : public TabStripModelObserver,
   virtual void ConfirmAddSearchProvider(TemplateURL* template_url,
                                         Profile* profile) OVERRIDE;
 
+  // Overridden from SearchTabHelperDelegate:
+  virtual void NavigateToURL(
+      const GURL& url,
+      WindowOpenDisposition disposition,
+      content::WebContents* source_contents) OVERRIDE;
+  virtual void OnWebContentsInstantSupportDisabled(
+      const content::WebContents* web_contents) OVERRIDE;
+  virtual void RemoveMostVisitedItemsMatchingOpenTabs(

[Jered, 2014/04/04 22:39:27]

This seems like pushing too much into Browser. Instead, can we have it return
the information we need to do the pruning we want to do? e.g. return a
set<string> urls but still do the MV pruning in SearchTabHelper.

[kmadhusu, 2014/04/07 21:44:15]

Done.

+      std::vector<InstantMostVisitedItem>* items) OVERRIDE;
+  virtual OmniboxView* GetOmniboxView() OVERRIDE;
+
   // Overridden from WebContentsModalDialogManagerDelegate:
   virtual void SetWebContentsBlocked(content::WebContents* web_contents,
                                      bool blocked) OVERRIDE;