Cleanup: Remove SearchTabHelperDelegate

chrome/browser/ui/search/search_tab_helper.h

Index: chrome/browser/ui/search/search_tab_helper.h
diff --git a/chrome/browser/ui/search/search_tab_helper.h b/chrome/browser/ui/search/search_tab_helper.h
index 095abf670c2c351d5cb85ec257f1a61b058f20a8..abfae10d7874074591a2e3abbe4824641720be4b 100644
--- a/chrome/browser/ui/search/search_tab_helper.h
+++ b/chrome/browser/ui/search/search_tab_helper.h
@@ -33,7 +33,6 @@ class InstantTabTest;
 class OmniboxView;
 class Profile;
 class SearchIPCRouterTest;
-class SearchTabHelperDelegate;
 
 // Per-tab search "helper".  Acts as the owner and controller of the tab's
 // search UI model.
@@ -81,7 +80,9 @@ class SearchTabHelper : public content::WebContentsObserver,
   // Called when the tab corresponding to |this| instance is deactivated.
   void OnTabDeactivated();
 
-  void set_delegate(SearchTabHelperDelegate* delegate) { delegate_ = delegate; }
+  // Called when the tab corresponding to |this| instance is attached to a
+  // browser window.
+  void SetOmniboxView(OmniboxView* omnibox_view);

[Peter Kasting, 2017/03/10 10:19:57]

Nit: The comment suggests that this would be named something like
OnTabAttachedToWindow().  It's slightly odd for the comments on this function to
document something seemingly-unrelated about what the caller does with it.

I wonder if this shouldn't be OnTabInserted() (since that's what the browser
function calling it is).  I also wonder if it should pull the omnibox view from
the browser (rather than having it provided), but that's mostly for API
cleanliness/parallelism with the above methods.

[Marc Treib, 2017/03/10 11:30:03]

Indeed, that seems much more consistent with the other methods. Thanks!

I've made it "OnTabAttachedToWindow(BrowerWindow*)"; IMO "OnTabInserted" lacks
some context here (inserted into what?).

 
   SearchIPCRouter& ipc_router_for_testing() { return ipc_router_; }
 
@@ -176,9 +177,6 @@ class SearchTabHelper : public content::WebContentsObserver,
   // active tab is in mode SEARCH_SUGGESTIONS.
   bool IsInputInProgress() const;
 
-  // Returns the OmniboxView for |web_contents_| or NULL if not available.
-  OmniboxView* GetOmniboxView() const;
-
   const bool is_search_enabled_;
 
   // Model object for UI that cares about search state.
@@ -190,10 +188,7 @@ class SearchTabHelper : public content::WebContentsObserver,
 
   InstantService* instant_service_;
 
-  // Delegate for notifying our owner about the SearchTabHelper state. Not owned
-  // by us.
-  // NULL on iOS and Android because they don't use the Instant framework.
-  SearchTabHelperDelegate* delegate_;
+  OmniboxView* omnibox_view_;
 
   DISALLOW_COPY_AND_ASSIGN(SearchTabHelper);
 };