Switch SearchTabHelper to use WebContentsUserData.

chrome/browser/ui/search/toolbar_search_animator.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/search/toolbar_search_animator.h"
 
 #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"
 
 namespace {
 
 const int kBackgroundChangeDelayMs = 100;
 const int kBackgroundChangeDurationMs = 200;
 
 const double kMinOpacity = 0.0f;
@@ skipping 37 matching lines @@
         !toolbar_model_->input_in_progress()) ||
        search_model_->mode().is_default());
 }
 
 void ToolbarSearchAnimator::OnOmniboxPopupClosed() {
   is_omnibox_popup_open_ = false;
   FOR_EACH_OBSERVER(ToolbarSearchAnimatorObserver, observers_,
                     OnToolbarSeparatorChanged());
 }
 
-void ToolbarSearchAnimator::FinishAnimation(TabContents* tab_contents) {
-  Reset(tab_contents);
+void ToolbarSearchAnimator::FinishAnimation(
+    content::WebContents* web_contents) {
+  Reset(web_contents);
 }
 
 void ToolbarSearchAnimator::AddObserver(
     ToolbarSearchAnimatorObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void ToolbarSearchAnimator::RemoveObserver(
     ToolbarSearchAnimatorObserver* observer) {
   observers_.RemoveObserver(observer);
@@ skipping 59 matching lines @@
   background_animation_.reset(new ui::MultiAnimation(parts));
   background_animation_->set_continuous(false);
   background_animation_->set_delegate(this);
 }
 
 void ToolbarSearchAnimator::StartBackgroundChange() {
   InitBackgroundAnimation();
   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();
 
   background_animation_.reset();
 
   // Notify observers of animation cancelation.
   if (notify_background_observers) {
     FOR_EACH_OBSERVER(ToolbarSearchAnimatorObserver, observers_,
-                      OnToolbarBackgroundAnimatorCanceled(tab_contents));
+                      OnToolbarBackgroundAnimatorCanceled(web_contents));
   }
 }
 
 }  // namespace search
 }  // namespace chrome