Revert 80519 - Move favicon from TabContents to TabContentsWrapper.

chrome/browser/ui/gtk/hung_renderer_dialog_gtk.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/browser_dialogs.h"
 
 #include <gtk/gtk.h>
 
 #include "base/process_util.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/favicon_tab_helper.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/logging_chrome.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"
 #include "content/common/result_codes.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
@@ skipping 126 matching lines @@
   gtk_list_store_clear(model_);
 
   GtkTreeIter tree_iter;
   for (TabContentsIterator it; !it.done(); ++it) {
     if (it->tab_contents()->GetRenderProcessHost() ==
         hung_contents->GetRenderProcessHost()) {
       gtk_list_store_append(model_, &tree_iter);
       std::string title = UTF16ToUTF8(it->tab_contents()->GetTitle());
       if (title.empty())
         title = UTF16ToUTF8(TabContentsWrapper::GetDefaultTitle());
-      SkBitmap favicon = it->favicon_tab_helper()->GetFavicon();
+      SkBitmap favicon = it->tab_contents()->GetFavicon();
 
       GdkPixbuf* pixbuf = NULL;
       if (favicon.width() > 0)
         pixbuf = gfx::GdkPixbufFromSkBitmap(&favicon);
       gtk_list_store_set(model_, &tree_iter,
           COL_FAVICON, pixbuf,
           COL_TITLE, title.c_str(),
           -1);
       if (pixbuf)
         g_object_unref(pixbuf);
@@ skipping 51 matching lines @@
     g_instance->ShowForTabContents(contents);
   }
 }
 
 void HideHungRendererDialog(TabContents* contents) {
   if (!logging::DialogsAreSuppressed() && g_instance)
     g_instance->EndForTabContents(contents);
 }
 
 }  // namespace browser