Revert 80519 - Move favicon from TabContents to TabContentsWrapper.

chrome/browser/ui/cocoa/tabpose_window.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/tabpose_window.h"
 
 #import <QuartzCore/QuartzCore.h>
 
 #include <algorithm>
 
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/memory/scoped_callback_factory.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browser_process.h"
 #import "chrome/browser/debugger/devtools_window.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/renderer_host/render_widget_host_view_mac.h"
 #include "chrome/browser/tab_contents/thumbnail_generator.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_strip_model_observer_bridge.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
@@ skipping 467 matching lines @@
   rect.origin.y += NSMinY(thumb_start) - NSMinY(thumb_rect_);
   return rect;
 }
 
 SkBitmap Tile::favicon() const {
   if (contents_->extension_tab_helper()->is_app()) {
     SkBitmap* icon = contents_->extension_tab_helper()->GetExtensionAppIcon();
     if (icon)
       return *icon;
   }
-  return contents_->favicon_tab_helper()->GetFavicon();
+  return contents_->tab_contents()->GetFavicon();
 }
 
 NSRect Tile::GetTitleStartRectRelativeTo(const Tile& tile) const {
   NSRect thumb_start = GetStartRectRelativeTo(tile);
   CGFloat scale_to_start = NSWidth(thumb_start) / NSWidth(thumb_rect_);
   NSRect rect =
       ScaleRectWithOrigin(title_rect_, thumb_rect_.origin, scale_to_start);
   rect.origin.x += NSMinX(thumb_start) - NSMinX(thumb_rect_);
   rect.origin.y += NSMinY(thumb_start) - NSMinY(thumb_rect_);
   return rect;
@@ skipping 1192 matching lines @@
   tile.set_tab_contents(contents);
   ThumbnailLayer* thumbLayer = [allThumbnailLayers_ objectAtIndex:index];
   [thumbLayer setTabContents:contents];
 }
 
 - (void)tabStripModelDeleted {
   [self close];
 }
 
 @end