Switch SearchTabHelper to use WebContentsUserData.

chrome/browser/ui/views/tabs/browser_tab_strip_controller.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_TABS_BROWSER_TAB_STRIP_CONTROLLER_H_
 #define CHROME_BROWSER_UI_VIEWS_TABS_BROWSER_TAB_STRIP_CONTROLLER_H_
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/api/prefs/pref_change_registrar.h"
@@ skipping 91 matching lines @@
   virtual void TabBlockedStateChanged(TabContents* contents,
                                       int model_index) OVERRIDE;
 
   // chrome::search::SearchModelObserver implementation:
   virtual void ModeChanged(const chrome::search::Mode& old_mode,
                            const chrome::search::Mode& new_mode) OVERRIDE;
 
   // chrome::search::ToolbarSearchAnimatorObserver implementation:
   virtual void OnToolbarBackgroundAnimatorProgressed() OVERRIDE;
   virtual void OnToolbarBackgroundAnimatorCanceled(
-      TabContents* tab_contents) OVERRIDE;
+      content::WebContents* web_contents) OVERRIDE;
   virtual void OnToolbarSeparatorChanged() OVERRIDE {}
 
   // content::NotificationObserver implementation:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
  protected:
   // The context in which SetTabRendererDataFromModel is being called.
   enum TabStatus {
@@ skipping 10 matching lines @@
   Profile* profile() const { return model_->profile(); }
 
   const TabStrip* tabstrip() const { return tabstrip_; }
 
   const Browser* browser() const { return browser_; }
 
  private:
   class TabContextMenuContents;
 
   // Invokes tabstrip_->SetTabData.
-  void SetTabDataAt(TabContents* contents, int model_index);
+  void SetTabDataAt(content::WebContents* web_contents, int model_index);
 
   void StartHighlightTabsForCommand(
       TabStripModel::ContextMenuCommand command_id,
       BaseTab* tab);
   void StopHighlightTabsForCommand(
       TabStripModel::ContextMenuCommand command_id,
       BaseTab* tab);
 
   // Adds a tab.
   void AddTab(TabContents* contents, int index, bool is_active);
@@ skipping 13 matching lines @@
 
   // Helper for performing tab selection as a result of dragging over a tab.
   HoverTabSelector hover_tab_selector_;
 
   PrefChangeRegistrar local_pref_registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserTabStripController);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_TABS_BROWSER_TAB_STRIP_CONTROLLER_H_