Switch SearchTabHelper to use WebContentsUserData.

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 aa5efc0fd4c3e9e9ad9f0c40f291be291ee3b884..044cf017b77b4c91f9d511f0673d5f3e3a8cdb1a 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -1045,7 +1045,7 @@ void Browser::TabDetachedAt(TabContents* contents, int index) {
 
 void Browser::TabDeactivated(TabContents* contents) {
   fullscreen_controller_->OnTabDeactivated(contents);
-  search_delegate_->OnTabDeactivated(contents);
+  search_delegate_->OnTabDeactivated(contents->web_contents());
 
   // Save what the user's currently typing, so it can be restored when we
   // switch back to this tab.
@@ -1914,7 +1914,7 @@ void Browser::UpdateToolbar(bool should_restore_state) {
 
 void Browser::UpdateSearchState(TabContents* contents) {
   if (chrome::search::IsInstantExtendedAPIEnabled(profile_))
-    search_delegate_->OnTabActivated(contents);
+    search_delegate_->OnTabActivated(contents->web_contents());
 }
 
 void Browser::ScheduleUIUpdate(const WebContents* source,
@@ -2129,7 +2129,7 @@ void Browser::TabDetachedAtImpl(TabContents* contents, int index,
   }
 
   // Stop observing search model changes for this tab.
-  search_delegate_->OnTabDetached(contents);
+  search_delegate_->OnTabDetached(contents->web_contents());
 
   registrar_.Remove(this, content::NOTIFICATION_INTERSTITIAL_ATTACHED,
                     content::Source<WebContents>(contents->web_contents()));