Revert 80519 - Move favicon from TabContents to TabContentsWrapper.

chrome/browser/aeropeek_manager.cc

Index: chrome/browser/aeropeek_manager.cc
===================================================================
--- chrome/browser/aeropeek_manager.cc	(revision 80859)
+++ chrome/browser/aeropeek_manager.cc	(working copy)
@@ -17,7 +17,6 @@
 #include "base/win/windows_version.h"
 #include "chrome/browser/app_icon_win.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/favicon_tab_helper.h"
 #include "chrome/browser/tab_contents/thumbnail_generator.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser_list.h"
@@ -1070,7 +1069,7 @@
                          GetTabID(tab->tab_contents()),
                          foreground,
                          tab->tab_contents()->GetTitle(),
-                         tab->favicon_tab_helper()->GetFavicon());
+                         tab->tab_contents()->GetFavicon());
   tab_list_.push_back(window);
 }
 
@@ -1175,7 +1174,7 @@
   // hurting the rendering performance. (These functions just save the
   // information needed for handling update requests from Windows.)
   window->SetTitle(contents->tab_contents()->GetTitle());
-  window->SetFavicon(contents->favicon_tab_helper()->GetFavicon());
+  window->SetFavicon(contents->tab_contents()->GetFavicon());
   window->Update(contents->tab_contents()->is_loading());
 }
 
Property changes on: chrome/browser/aeropeek_manager.cc
___________________________________________________________________
Added: svn:mergeinfo