Revert 80519 - Move favicon from TabContents to TabContentsWrapper.

chrome/browser/ui/gtk/location_bar_view_gtk.cc

Index: chrome/browser/ui/gtk/location_bar_view_gtk.cc
===================================================================
--- chrome/browser/ui/gtk/location_bar_view_gtk.cc	(revision 80859)
+++ chrome/browser/ui/gtk/location_bar_view_gtk.cc	(working copy)
@@ -26,7 +26,6 @@
 #include "chrome/browser/extensions/extension_browser_event_router.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tabs_module.h"
-#include "chrome/browser/favicon_tab_helper.h"
 #include "chrome/browser/instant/instant_controller.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
@@ -563,7 +562,7 @@
 }
 
 SkBitmap LocationBarViewGtk::GetFavicon() const {
-  return GetTabContentsWrapper()->favicon_tab_helper()->GetFavicon();
+  return GetTabContents()->GetFavicon();
 }
 
 string16 LocationBarViewGtk::GetTitle() const {
@@ -574,7 +573,7 @@
   return browser_->instant();
 }
 
-TabContentsWrapper* LocationBarViewGtk::GetTabContentsWrapper() const {
+TabContentsWrapper* LocationBarViewGtk::GetTabContentsWrapper() {
   return browser_->GetSelectedTabContentsWrapper();
 }