Switch SearchTabHelper to use WebContentsUserData.

chrome/browser/ui/tab_contents/tab_contents.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_H_
 #define CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
@@ skipping 56 matching lines @@
 class ZoomController;
 
 namespace browser_sync {
 class SyncedTabDelegate;
 }
 
 namespace captive_portal {
 class CaptivePortalTabHelper;
 }
 
-namespace chrome {
-namespace search {
-class SearchTabHelper;
-}
-}
-
 namespace chromeos {
 class SimpleWebViewDialog;
 class WebUILoginView;
 }
 
 namespace extensions {
 class WebAuthFlow;
 class WebNavigationTabObserver;
 }
 
@@ skipping 128 matching lines @@
   prerender::PrerenderTabHelper* prerender_tab_helper() {
     return prerender_tab_helper_.get();
   }
 
   SadTabHelper* sad_tab_helper() { return sad_tab_helper_.get(); }
 
   SearchEngineTabHelper* search_engine_tab_helper() {
     return search_engine_tab_helper_.get();
   }
 
-  chrome::search::SearchTabHelper* search_tab_helper() {
-    return search_tab_helper_.get();
-  }
-
   browser_sync::SyncedTabDelegate* synced_tab_delegate() {
     return synced_tab_delegate_.get();
   }
 
   TabSpecificContentSettings* content_settings() {
     return content_settings_.get();
   }
 
   // NOTE: This returns NULL unless in-browser thumbnail generation is enabled.
   ThumbnailGenerator* thumbnail_generator() {
@@ skipping 52 matching lines @@
   // PasswordManager and its delegate. The delegate must outlive the manager,
   // per documentation in password_manager.h.
   scoped_ptr<PasswordManagerDelegate> password_manager_delegate_;
   scoped_ptr<PasswordManager> password_manager_;
 
   scoped_ptr<PrefsTabHelper> prefs_tab_helper_;
   scoped_ptr<prerender::PrerenderTabHelper> prerender_tab_helper_;
 
   scoped_ptr<SadTabHelper> sad_tab_helper_;
   scoped_ptr<SearchEngineTabHelper> search_engine_tab_helper_;
-  scoped_ptr<chrome::search::SearchTabHelper> search_tab_helper_;
   scoped_ptr<browser_sync::SyncedTabDelegate> synced_tab_delegate_;
 
   // The TabSpecificContentSettings object is used to query the blocked content
   // state by various UI elements.
   scoped_ptr<TabSpecificContentSettings> content_settings_;
 
   scoped_ptr<ThumbnailGenerator> thumbnail_generator_;
   scoped_ptr<TranslateTabHelper> translate_tab_helper_;
 
   // Handles displaying a web intents picker to the user.
@@ skipping 20 matching lines @@
 
   // The supporting objects need to outlive the WebContents dtor (as they may
   // be called upon during its execution). As a result, this must come last
   // in the list.
   scoped_ptr<content::WebContents> web_contents_;
 
   DISALLOW_COPY_AND_ASSIGN(TabContents);
 };
 
 #endif  // CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_H_