Switch SearchTabHelper to use WebContentsUserData.

chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.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/views/ash/browser_non_client_frame_view_ash.h"
 
 #include "ash/wm/frame_painter.h"
 #include "ash/wm/workspace/frame_maximize_button.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 393 matching lines @@
 
 ///////////////////////////////////////////////////////////////////////////////
 // chrome::search::ToolbarSearchAnimator::Observer overrides:
 
 void BrowserNonClientFrameViewAsh::OnToolbarBackgroundAnimatorProgressed() {
   // We're fading in the toolbar background, repaint the toolbar background.
   browser_view()->toolbar()->SchedulePaint();
 }
 
 void BrowserNonClientFrameViewAsh::OnToolbarBackgroundAnimatorCanceled(
-    TabContents* tab_contents) {
+    content::WebContents* web_contents) {
   // Fade in of toolbar background has been canceled, repaint the toolbar
   // background.
   browser_view()->toolbar()->SchedulePaint();
 }
 
 void BrowserNonClientFrameViewAsh::OnToolbarSeparatorChanged() {
   // Omnibox popup has finished closing, paint the toolbar separator.
   browser_view()->toolbar()->SchedulePaint();
 }
 
@@ skipping 174 matching lines @@
 BrowserNonClientFrameViewAsh::GetThemeFrameOverlayImage() const {
   ui::ThemeProvider* tp = GetThemeProvider();
   if (tp->HasCustomImage(IDR_THEME_FRAME_OVERLAY) &&
       browser_view()->IsBrowserTypeNormal() &&
       !browser_view()->IsOffTheRecord()) {
     return tp->GetImageSkiaNamed(ShouldPaintAsActive() ?
         IDR_THEME_FRAME_OVERLAY : IDR_THEME_FRAME_OVERLAY_INACTIVE);
   }
   return NULL;
 }