Revert 80519 - Move favicon from TabContents to TabContentsWrapper.

chrome/browser/task_manager/task_manager_resource_providers.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/task_manager/task_manager_resource_providers.h"
 
 #include "base/basictypes.h"
 #include "base/file_version_info.h"
 #include "base/i18n/rtl.h"
 #include "base/process_util.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/threading/thread.h"
 #include "base/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/background_contents_service.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/favicon_tab_helper.h"
 #include "chrome/browser/notifications/balloon_collection.h"
 #include "chrome/browser/notifications/balloon_host.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/prerender/prerender_contents.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/tab_contents/background_contents.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
@@ skipping 163 matching lines @@
       tab_contents_->profile()->GetExtensionService();
   int message_id = GetMessagePrefixID(
       extensions_service->IsInstalledApp(
           tab_contents_->tab_contents()->GetURL()),
       tab_contents_->tab_contents()->HostsExtension(),
       tab_contents_->profile()->IsOffTheRecord());
   return l10n_util::GetStringFUTF16(message_id, tab_title);
 }
 
 SkBitmap TaskManagerTabContentsResource::GetIcon() const {
-  return tab_contents_->favicon_tab_helper()->GetFavicon();
+  return tab_contents_->tab_contents()->GetFavicon();
 }
 
 TabContentsWrapper* TaskManagerTabContentsResource::GetTabContents() const {
   return tab_contents_;
 }
 
 const Extension* TaskManagerTabContentsResource::GetExtension() const {
   if (tab_contents_->tab_contents()->HostsExtension()) {
     ExtensionService* extensions_service =
         tab_contents_->profile()->GetExtensionService();
@@ skipping 1352 matching lines @@
 
   return &resource_;
 }
 
 void TaskManagerBrowserProcessResourceProvider::StartUpdating() {
   task_manager_->AddResource(&resource_);
 }
 
 void TaskManagerBrowserProcessResourceProvider::StopUpdating() {
 }