Revert 80519 - Move favicon from TabContents to TabContentsWrapper.

chrome/browser/ui/web_applications/web_app_ui.cc

Index: chrome/browser/ui/web_applications/web_app_ui.cc
===================================================================
--- chrome/browser/ui/web_applications/web_app_ui.cc	(revision 80859)
+++ chrome/browser/ui/web_applications/web_app_ui.cc	(working copy)
@@ -9,7 +9,6 @@
 #include "base/task.h"
 #include "base/win/windows_version.h"
 #include "chrome/browser/extensions/extension_tab_helper.h"
-#include "chrome/browser/favicon_tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
@@ -134,7 +133,7 @@
     return;
   }
 
-  tab_contents_->favicon_tab_helper()->DownloadImage(
+  tab_contents_->tab_contents()->favicon_helper().DownloadImage(
       unprocessed_icons_.back().url,
       std::max(unprocessed_icons_.back().width,
                unprocessed_icons_.back().height),
@@ -304,7 +303,7 @@
                                           tab_contents->GetTitle()) :
       app_info.title;
   info->description = app_info.description;
-  info->favicon = tab_contents_wrapper->favicon_tab_helper()->GetFavicon();
+  info->favicon = tab_contents->GetFavicon();
 }
 
 void UpdateShortcutForTabContents(TabContentsWrapper* tab_contents) {