Revert 80519 - Move favicon from TabContents to TabContentsWrapper.

chrome/browser/ui/views/create_application_shortcut_view.cc

 // Copyright (c) 2011 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/create_application_shortcut_view.h"
 
 #include "base/callback.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/windows_version.h"
 #include "chrome/browser/extensions/extension_tab_helper.h"
-#include "chrome/browser/favicon_tab_helper.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/web_applications/web_app_ui.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/tab_contents/tab_contents_delegate.h"
@@ skipping 425 matching lines @@
 void CreateUrlApplicationShortcutView::FetchIcon() {
   // There should only be fetch job at a time.
   DCHECK(pending_download_ == NULL);
 
   if (unprocessed_icons_.empty())  // No icons to fetch.
     return;
 
   pending_download_ = new IconDownloadCallbackFunctor(this);
   DCHECK(pending_download_);
 
-  tab_contents_->favicon_tab_helper()->DownloadImage(
+  tab_contents_->tab_contents()->favicon_helper().DownloadImage(
       unprocessed_icons_.back().url,
       std::max(unprocessed_icons_.back().width,
                unprocessed_icons_.back().height),
       NewCallback(pending_download_, &IconDownloadCallbackFunctor::Run));
 
   unprocessed_icons_.pop_back();
 }
 
 void CreateUrlApplicationShortcutView::OnIconDownloaded(bool errored,
                                                         const SkBitmap& image) {
@@ skipping 52 matching lines @@
 void CreateChromeApplicationShortcutView::OnImageLoaded(
     SkBitmap* image, const ExtensionResource& resource, int index) {
   if (image->isNull()) {
     NOTREACHED() << "Corrupt image in profile?";
     return;
   }
   shortcut_info_.favicon = *image;
   static_cast<AppInfoView*>(app_info_)->UpdateIcon(shortcut_info_.favicon);
 }