Move favicon from TabContents to TabContentsWrapper.

content/browser/tab_contents/tab_contents.h

Index: content/browser/tab_contents/tab_contents.h
diff --git a/content/browser/tab_contents/tab_contents.h b/content/browser/tab_contents/tab_contents.h
index 356d2b5fdfec19d4d8447c50dc3401426ac95396..1ef7c86365ff4ed07d30b826d27dc8f323d2cb98 100644
--- a/content/browser/tab_contents/tab_contents.h
+++ b/content/browser/tab_contents/tab_contents.h
@@ -16,7 +16,6 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "chrome/browser/download/save_package.h"
-#include "chrome/browser/favicon_helper.h"
 #include "chrome/browser/prefs/pref_change_registrar.h"
 #include "chrome/browser/tab_contents/tab_specific_content_settings.h"
 #include "chrome/browser/ui/app_modal_dialogs/js_modal_dialog.h"
@@ -173,11 +172,6 @@ class TabContents : public PageNavigator,
     return view_.get();
   }
 
-  // Returns the FaviconHelper of this TabContents.
-  FaviconHelper& favicon_helper() {
-    return *favicon_helper_.get();
-  }
-
   // Tab navigation state ------------------------------------------------------
 
   // Returns the current navigation properties, which if a navigation is
@@ -206,18 +200,6 @@ class TabContents : public PageNavigator,
   // the user is invited to type into it.
   virtual bool ShouldDisplayURL();
 
-  // Returns the favicon for this tab, or an isNull() bitmap if the tab does not
-  // have a favicon. The default implementation uses the current navigation
-  // entry.
-  SkBitmap GetFavicon() const;
-
-  // Returns true if we are not using the default favicon.
-  bool FaviconIsValid() const;
-
-  // Returns whether the favicon should be displayed. If this returns false, no
-  // space is provided for the favicon, and the favicon is never displayed.
-  virtual bool ShouldDisplayFavicon();
-
   // Return whether this tab contents is loading a resource.
   bool is_loading() const { return is_loading_; }
 
@@ -348,9 +330,6 @@ class TabContents : public PageNavigator,
                     const NavigationEntry::SSLStatus& ssl,
                     bool show_history);
 
-  // Saves the favicon for the current page.
-  void SaveFavicon();
-
   // Window management ---------------------------------------------------------
 
   // Create a new window constrained to this TabContents' clip and visibility.
@@ -643,6 +622,10 @@ class TabContents : public PageNavigator,
   // Query the WebUIFactory for the TypeID for the current URL.
   WebUI::TypeID GetWebUITypeForCurrentState();
 
+  // Returns the WebUI for the current state of the tab. This will either be
+  // the pending WebUI, the committed WebUI, or NULL.
+  WebUI* GetWebUIForCurrentState();
+
  protected:
   friend class TabContentsObserver;
   friend class TabContentsObserver::Registrar;
@@ -752,10 +735,6 @@ class TabContents : public PageNavigator,
   void ExpireInfoBars(
       const NavigationController::LoadCommittedDetails& details);
 
-  // Returns the WebUI for the current state of the tab. This will either be
-  // the pending WebUI, the committed WebUI, or NULL.
-  WebUI* GetWebUIForCurrentState();
-
   // Navigation helpers --------------------------------------------------------
   //
   // These functions are helpers for Navigate() and DidNavigate().
@@ -981,9 +960,6 @@ class TabContents : public PageNavigator,
   // Handles drag and drop event forwarding to extensions.
   BookmarkDrag* bookmark_drag_;
 
-  // Handles downloading favicons.
-  scoped_ptr<FaviconHelper> favicon_helper_;
-
   // Cached web app icon.
   SkBitmap app_icon_;
 
@@ -1072,10 +1048,6 @@ class TabContents : public PageNavigator,
   // once.
   bool notify_disconnection_;
 
-  // Maps from handle to page_id.
-  typedef std::map<FaviconService::Handle, int32> HistoryRequestMap;
-  HistoryRequestMap history_requests_;
-
 #if defined(OS_WIN)
   // Handle to an event that's set when the page is showing a message box (or
   // equivalent constrained window).  Plugin processes check this to know if