Move favicon from TabContents to TabContentsWrapper.

chrome/browser/ui/cocoa/hung_renderer_controller.mm

Index: chrome/browser/ui/cocoa/hung_renderer_controller.mm
diff --git a/chrome/browser/ui/cocoa/hung_renderer_controller.mm b/chrome/browser/ui/cocoa/hung_renderer_controller.mm
index ccd36e78841ae08b5399a9ccbfa62c7fddf6acb7..f217f47020150d6b2956fffbd2d8309e3b61845a 100644
--- a/chrome/browser/ui/cocoa/hung_renderer_controller.mm
+++ b/chrome/browser/ui/cocoa/hung_renderer_controller.mm
@@ -14,6 +14,7 @@
 #import "chrome/browser/ui/cocoa/multi_key_equivalent_button.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/logging_chrome.h"
+#include "chrome/browser/favicon_tab_helper.h"
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
@@ -147,7 +148,7 @@ HungRendererController* g_instance = NULL;
 
       // TabContents can return a null SkBitmap if it has no favicon.  If this
       // happens, use the default favicon.
-      const SkBitmap& bitmap = it->tab_contents()->GetFavicon();
+      const SkBitmap& bitmap = it->favicon_tab_helper()->GetFavicon();
       if (!bitmap.isNull()) {
         [favicons addObject:gfx::SkBitmapToNSImage(bitmap)];
       } else {