Cleanup: Remove SearchTabHelperDelegate

chrome/browser/ui/browser.cc

Index: chrome/browser/ui/browser.cc
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index c4c4a2dbd2e1975c17fed4a63aee373337d66b92..d05eaf5b18c72c63eb0350b4a25d83063d9a9db6 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -966,6 +966,11 @@ void Browser::TabInsertedAt(TabStripModel* tab_strip_model,
       SessionTabHelper::FromWebContents(contents);
   session_tab_helper->SetWindowID(session_id());
 
+  SearchTabHelper* search_tab_helper =
+      SearchTabHelper::FromWebContents(contents);

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

Nit: Or could inline into next line

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

Sure, done.
(I was copying the style from SessionTabHelper above; I've inlined that too.)

+  search_tab_helper->SetOmniboxView(
+      window_->GetLocationBar()->GetOmniboxView());
+
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_TAB_PARENTED,
       content::Source<content::WebContents>(contents),
@@ -1983,13 +1988,6 @@ bool Browser::CanSaveContents(content::WebContents* web_contents) const {
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-// Browser, SearchTabHelperDelegate implementation:
-
-OmniboxView* Browser::GetOmniboxView() {
-  return window_->GetLocationBar()->GetOmniboxView();
-}
-
-///////////////////////////////////////////////////////////////////////////////
 // Browser, web_modal::WebContentsModalDialogManagerDelegate implementation:
 
 void Browser::SetWebContentsBlocked(content::WebContents* web_contents,
@@ -2429,7 +2427,6 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) {
   WebContentsModalDialogManager::FromWebContents(web_contents)->
       SetDelegate(delegate);
   CoreTabHelper::FromWebContents(web_contents)->set_delegate(delegate);
-  SearchTabHelper::FromWebContents(web_contents)->set_delegate(delegate);
   translate::ContentTranslateDriver& content_translate_driver =
       ChromeTranslateClient::FromWebContents(web_contents)->translate_driver();
   if (delegate) {