Switch SearchTabHelper to use WebContentsUserData.

chrome/browser/ui/search/search_delegate.h

Index: chrome/browser/ui/search/search_delegate.h
diff --git a/chrome/browser/ui/search/search_delegate.h b/chrome/browser/ui/search/search_delegate.h
index 7b4c42dacec74dec2d72620019a72c4d7d9ee1d6..ed901e916bfff4e5688df417c7428ad523c0552b 100644
--- a/chrome/browser/ui/search/search_delegate.h
+++ b/chrome/browser/ui/search/search_delegate.h
@@ -10,9 +10,12 @@
 #include "chrome/browser/ui/search/search_model_observer.h"
 #include "chrome/browser/ui/search/toolbar_search_animator.h"
 
-class TabContents;
 class ToolbarModel;
 
+namespace content {
+class WebContents;
+}
+
 namespace chrome {
 namespace search {
 
@@ -35,15 +38,15 @@ class SearchDelegate : public SearchModelObserver {
 
   // When the active tab is changed, the model state of this new active tab is
   // propagated to the browser.
-  void OnTabActivated(TabContents* contents);
+  void OnTabActivated(content::WebContents* web_contents);
 
   // When a tab is deactivated, this class no longer observes changes to the
   // tab's model.
-  void OnTabDeactivated(TabContents* contents);
+  void OnTabDeactivated(content::WebContents* web_contents);
 
   // When a tab is detached, this class no longer observes changes to the
   // tab's model.
-  void OnTabDetached(TabContents* contents);
+  void OnTabDetached(content::WebContents* web_contents);
 
   ToolbarSearchAnimator& toolbar_search_animator() {
     return toolbar_search_animator_;
@@ -51,7 +54,7 @@ class SearchDelegate : public SearchModelObserver {
 
  private:
   // Stop observing tab.
-  void StopObserveringTab(TabContents* contents);
+  void StopObservingTab(content::WebContents* web_contents);
 
   // Weak.  The Browser class owns this.  The active |tab_model_| state is
   // propagated to the |browser_model_|.