Switch SearchTabHelper to use WebContentsUserData.

chrome/browser/ui/tab_contents/tab_contents.h

Index: chrome/browser/ui/tab_contents/tab_contents.h
diff --git a/chrome/browser/ui/tab_contents/tab_contents.h b/chrome/browser/ui/tab_contents/tab_contents.h
index 2c9c4194a5e737541539ef5e87733b617af4b365..808aac3d28d91bfa196ba1ff283e5358987935d3 100644
--- a/chrome/browser/ui/tab_contents/tab_contents.h
+++ b/chrome/browser/ui/tab_contents/tab_contents.h
@@ -79,12 +79,6 @@ namespace captive_portal {
 class CaptivePortalTabHelper;
 }
 
-namespace chrome {
-namespace search {
-class SearchTabHelper;
-}
-}
-
 namespace chromeos {
 class SimpleWebViewDialog;
 class WebUILoginView;
@@ -252,10 +246,6 @@ class TabContents : public content::WebContentsObserver {
     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();
   }
@@ -332,7 +322,6 @@ class TabContents : public content::WebContentsObserver {
 
   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