Revert 80519 - Move favicon from TabContents to TabContentsWrapper.

chrome/browser/ui/web_applications/web_app_ui.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/web_applications/web_app_ui.h"
 
 #include "base/file_util.h"
 #include "base/path_service.h"
 #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"
 #include "chrome/common/chrome_paths.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/notification_registrar.h"
 
 #if defined(OS_LINUX)
 #include "base/environment.h"
@@ skipping 104 matching lines @@
     DeleteMe();  // We are done if underlying TabContents is gone.
     return;
   }
 
   if (unprocessed_icons_.empty()) {
     // No app icon. Just use the favicon from TabContents.
     UpdateShortcuts();
     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),
       NewCallback(this, &UpdateShortcutWorker::OnIconDownloaded));
   unprocessed_icons_.pop_back();
 }
 
 void UpdateShortcutWorker::OnIconDownloaded(int download_id,
                                             bool errored,
                                             const SkBitmap& image) {
@@ skipping 149 matching lines @@
   const WebApplicationInfo& app_info =
       tab_contents_wrapper->extension_tab_helper()->web_app_info();
 
   info->url = app_info.app_url.is_empty() ? tab_contents->GetURL() :
                                             app_info.app_url;
   info->title = app_info.title.empty() ?
       (tab_contents->GetTitle().empty() ? UTF8ToUTF16(info->url.spec()) :
                                           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) {
 #if defined(OS_WIN)
   // UpdateShortcutWorker will delete itself when it's done.
   UpdateShortcutWorker* worker = new UpdateShortcutWorker(tab_contents);
   worker->Run();
 #endif  // defined(OS_WIN)
 }
 
 }  // namespace web_app