Switch SearchTabHelper to use WebContentsUserData.

chrome/browser/ui/search/toolbar_search_animator_unittest.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 "base/command_line.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/search/search.h"
 #include "chrome/browser/ui/search/search_delegate.h"
 #include "chrome/browser/ui/search/search_model.h"
 #include "chrome/browser/ui/search/search_tab_helper.h"
 #include "chrome/browser/ui/search/toolbar_search_animator_observer.h"
-#include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/animation/multi_animation.h"
 
 // Avoid tests on branded Chrome where channel is set to CHANNEL_STABLE.
 #define AVOID_TEST_ON_BRANDED_CHROME() { \
   if (!chrome::search::IsInstantExtendedAPIEnabled(profile())) \
     return; \
 }
@@ skipping 14 matching lines @@
     got_progressed_ = true;
     if (cancel_halfway_ && animator_->background_animation_.get() &&
         animator_->background_animation_->GetCurrentValue() > 0.5) {
       MessageLoop::current()->Quit();
       return;
     }
     QuitMessageLoopIfDone();
   }
 
   virtual void OnToolbarBackgroundAnimatorCanceled(
-      TabContents* tab_contents) OVERRIDE {
+      content::WebContents* web_contents) OVERRIDE {
     got_canceled_ = true;
     if (!cancel_halfway_)
       QuitMessageLoopIfDone();
   }
 
   virtual void OnToolbarSeparatorChanged() OVERRIDE {}
 
   void set_cancel_halfway(bool cancel) {
     cancel_halfway_ = cancel;
   }
@@ skipping 45 matching lines @@
   }
 
   void RemoveDefaultObserver() {
     if (default_observer_.get()) {
       animator().RemoveObserver(default_observer_.get());
       default_observer_.reset(NULL);
     }
   }
 
   void SetMode(const Mode::Type mode, bool animate) {
-    TabContents* contents = chrome::GetTabContentsAt(browser(), 0);
-    contents->search_tab_helper()->model()->SetMode(Mode(mode, animate));
+    content::WebContents* web_contents = chrome::GetWebContentsAt(browser(), 0);
+    chrome::search::SearchTabHelper::FromWebContents(web_contents)->model()->
+        SetMode(Mode(mode, animate));
   }
 
   void RunMessageLoop(bool cancel_halfway) {
     // Run the message loop.  ToolbarSearchAnimatorTestObserver quits the
     // message loop when all animations have stopped.
     if (default_observer_.get())
       default_observer_->set_cancel_halfway(cancel_halfway);
     message_loop()->Run();
   }
 
@@ skipping 154 matching lines @@
   SetMode(Mode::MODE_DEFAULT, true);
 
   RunMessageLoop(false);
 
   EXPECT_TRUE(default_observer()->has_progressed());
   EXPECT_FALSE(default_observer()->has_canceled());
 }
 
 }  // namespace search
 }  // namespace chrome