Revert 80519 - Move favicon from TabContents to TabContentsWrapper.

chrome/browser/chromeos/wm_overview_controller.cc

Index: chrome/browser/chromeos/wm_overview_controller.cc
===================================================================
--- chrome/browser/chromeos/wm_overview_controller.cc	(revision 80859)
+++ chrome/browser/chromeos/wm_overview_controller.cc	(working copy)
@@ -13,7 +13,6 @@
 #include "chrome/browser/chromeos/wm_overview_favicon.h"
 #include "chrome/browser/chromeos/wm_overview_snapshot.h"
 #include "chrome/browser/chromeos/wm_overview_title.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.h"
@@ -240,7 +239,7 @@
     snapshots_[index].title->SetTitle(contents->tab_contents()->GetTitle());
     snapshots_[index].title->SetUrl(contents->tab_contents()->GetURL());
     snapshots_[index].favicon->SetFavicon(
-        contents->favicon_tab_helper()->GetFavicon());
+        contents->tab_contents()->GetFavicon());
     if (change_type != TabStripModelObserver::TITLE_NOT_LOADING)
       MarkSnapshotAsDirty(index);
   }
@@ -425,9 +424,7 @@
 
   node.favicon = new WmOverviewFavicon;
   node.favicon->Init(node.snapshot);
-  node.favicon->SetFavicon(
-      browser_->GetTabContentsWrapperAt(index)->
-          favicon_tab_helper()->GetFavicon());
+  node.favicon->SetFavicon(browser_->GetTabContentsAt(index)->GetFavicon());
 
   node.title = new WmOverviewTitle;
   node.title->Init(gfx::Size(std::max(0, cell_size.width() -
Property changes on: chrome/browser/chromeos/wm_overview_controller.cc
___________________________________________________________________
Added: svn:mergeinfo