Switch SearchTabHelper to use WebContentsUserData.

chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.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_ASH_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_
 #define CHROME_BROWSER_UI_VIEWS_ASH_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/ui/search/search_types.h"
@@ skipping 52 matching lines @@
   virtual void ButtonPressed(views::Button* sender,
                              const ui::Event& event) OVERRIDE;
 
   // Overridden from chrome::TabIconViewModel:
   virtual bool ShouldTabIconViewAnimate() const OVERRIDE;
   virtual gfx::ImageSkia GetFaviconForTabIconView() OVERRIDE;
 
   // Overridden from chrome::search::ToolbarSearchAnimatorObserver:
   virtual void OnToolbarBackgroundAnimatorProgressed() OVERRIDE;
   virtual void OnToolbarBackgroundAnimatorCanceled(
-      TabContents* tab_contents) OVERRIDE;
+      content::WebContents* web_contents) OVERRIDE;
   virtual void OnToolbarSeparatorChanged() OVERRIDE;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(BrowserNonClientFrameViewAshTest, UseShortHeader);
 
   // Distance between top of window and client area.
   int NonClientTopBorderHeight(bool force_restored) const;
 
   // Returns true if we should use a short header, such as for popup windows.
   bool UseShortHeader() const;
@@ skipping 26 matching lines @@
   scoped_ptr<ash::FramePainter> frame_painter_;
 
   // If true the |size_button_| minimizes, otherwise it toggles between
   // maximized and restored.
   bool size_button_minimizes_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserNonClientFrameViewAsh);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_ASH_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_