Switch SearchTabHelper to use WebContentsUserData.

chrome/browser/ui/search/search_model.h

Index: chrome/browser/ui/search/search_model.h
diff --git a/chrome/browser/ui/search/search_model.h b/chrome/browser/ui/search/search_model.h
index b1dcf3f7f431a37878793253cdc0fb41f870040a..14ecca0d5317752d8d789da3e6a37a6ec54f5260 100644
--- a/chrome/browser/ui/search/search_model.h
+++ b/chrome/browser/ui/search/search_model.h
@@ -9,8 +9,6 @@
 #include "base/observer_list.h"
 #include "chrome/browser/ui/search/search_types.h"
 
-class TabContents;
-
 namespace content {
 class WebContents;
 }
@@ -24,7 +22,7 @@ class SearchModelObserver;
 // changes.
 class SearchModel {
  public:
-  explicit SearchModel(TabContents* contents);
+  explicit SearchModel(content::WebContents* web_contents);
   ~SearchModel();
 
   // Change the mode.  Change notifications are sent to observers.  An animated
@@ -40,12 +38,12 @@ class SearchModel {
 
   // This can be NULL if this is the browser model and it's accessed during
   // startup or shutdown.
-  const TabContents* tab_contents() const {
-    return contents_;
+  const content::WebContents* web_contents() const {
+    return web_contents_;
   }
 
-  void set_tab_contents(TabContents* contents) {
-    contents_ = contents;
+  void set_web_contents(content::WebContents* web_contents) {
+    web_contents_ = web_contents;
   }
 
  private:
@@ -53,7 +51,7 @@ class SearchModel {
   Mode mode_;
 
   // Weak. Used to access current profile to determine incognito status.
-  TabContents* contents_;
+  content::WebContents* web_contents_;
 
   // Observers.
   ObserverList<SearchModelObserver> observers_;