Switch FaviconTabHelper to use WebContentsUserData.

chrome/browser/ui/views/extensions/shell_window_views.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/extensions/shell_window_views.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
@@ skipping 577 matching lines @@
   gfx::Image app_icon = shell_window_->app_icon();
   if (app_icon.IsEmpty())
     return GetWindowIcon();
   else
     return *app_icon.ToImageSkia();
 }
 
 gfx::ImageSkia ShellWindowViews::GetWindowIcon() {
   TabContents* contents = shell_window_->tab_contents();
   if (contents) {
-    gfx::Image app_icon = contents->favicon_tab_helper()->GetFavicon();
+    FaviconTabHelper* favicon_tab_helper =
+        FaviconTabHelper::FromWebContents(contents->web_contents());
+    gfx::Image app_icon = favicon_tab_helper->GetFavicon();
     if (!app_icon.IsEmpty())
       return *app_icon.ToImageSkia();
   }
   return gfx::ImageSkia();
 }
 
 bool ShellWindowViews::ShouldShowWindowTitle() const {
   return false;
 }
 
@@ skipping 76 matching lines @@
                                            ui::WindowShowState show_state) {
   views::WidgetDelegate::SaveWindowPlacement(bounds, show_state);
   shell_window_->SaveWindowPosition();
 }
 
 // static
 NativeShellWindow* NativeShellWindow::Create(
     ShellWindow* shell_window, const ShellWindow::CreateParams& params) {
   return new ShellWindowViews(shell_window, params);
 }