Switch SearchTabHelper to use WebContentsUserData.

chrome/browser/ui/search/toolbar_search_animator.cc

Index: chrome/browser/ui/search/toolbar_search_animator.cc
diff --git a/chrome/browser/ui/search/toolbar_search_animator.cc b/chrome/browser/ui/search/toolbar_search_animator.cc
index 9043a14cdc674b3e50088d96f66166cbbccc9682..46af7cbac407c7ab6092ffa877e0e3e86a621c2b 100644
--- a/chrome/browser/ui/search/toolbar_search_animator.cc
+++ b/chrome/browser/ui/search/toolbar_search_animator.cc
@@ -7,7 +7,6 @@
 #include "chrome/browser/ui/search/search_model.h"
 #include "chrome/browser/ui/search/search_types.h"
 #include "chrome/browser/ui/search/toolbar_search_animator_observer.h"
-#include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/toolbar/toolbar_model.h"
 #include "chrome/browser/ui/webui/instant_ui.h"
 #include "ui/base/animation/multi_animation.h"
@@ -65,8 +64,9 @@ void ToolbarSearchAnimator::OnOmniboxPopupClosed() {
                     OnToolbarSeparatorChanged());
 }
 
-void ToolbarSearchAnimator::FinishAnimation(TabContents* tab_contents) {
-  Reset(tab_contents);
+void ToolbarSearchAnimator::FinishAnimation(
+    content::WebContents* web_contents) {
+  Reset(web_contents);
 }
 
 void ToolbarSearchAnimator::AddObserver(
@@ -146,7 +146,7 @@ void ToolbarSearchAnimator::StartBackgroundChange() {
   background_animation_->Start();
 }
 
-void ToolbarSearchAnimator::Reset(TabContents* tab_contents) {
+void ToolbarSearchAnimator::Reset(content::WebContents* web_contents) {
   bool notify_background_observers =
       background_animation_.get() && background_animation_->is_animating();
 
@@ -155,7 +155,7 @@ void ToolbarSearchAnimator::Reset(TabContents* tab_contents) {
   // Notify observers of animation cancelation.
   if (notify_background_observers) {
     FOR_EACH_OBSERVER(ToolbarSearchAnimatorObserver, observers_,
-                      OnToolbarBackgroundAnimatorCanceled(tab_contents));
+                      OnToolbarBackgroundAnimatorCanceled(web_contents));
   }
 }