Move favicon from TabContents to TabContentsWrapper.

chrome/browser/ui/tab_contents/tab_contents_wrapper.h

Index: chrome/browser/ui/tab_contents/tab_contents_wrapper.h
diff --git a/chrome/browser/ui/tab_contents/tab_contents_wrapper.h b/chrome/browser/ui/tab_contents/tab_contents_wrapper.h
index 95202fd84ba482fd6f268cf411c2caa6064bfffd..5a98327a5a16705721e21024fbdec98195e2d35f 100644
--- a/chrome/browser/ui/tab_contents/tab_contents_wrapper.h
+++ b/chrome/browser/ui/tab_contents/tab_contents_wrapper.h
@@ -30,6 +30,7 @@ class DevToolsObserver;
 class Extension;
 class ExtensionMessageObserver;
 class ExtensionTabHelper;
+class FaviconTabHelper;
 class FileSelectObserver;
 class FindTabHelper;
 class NavigationController;
@@ -103,6 +104,8 @@ class TabContentsWrapper : public NotificationObserver,
     return extension_tab_helper_.get();
   }
 
+  FaviconTabHelper* favicon_tab_helper() { return favicon_tab_helper_.get(); }
+
   FindTabHelper* find_tab_helper() { return find_tab_helper_.get(); }
 
   PasswordManager* password_manager() { return password_manager_.get(); }
@@ -164,11 +167,9 @@ class TabContentsWrapper : public NotificationObserver,
   // "Tab Helpers" section in the member functions area, above.)
 
   scoped_ptr<AutocompleteHistoryManager> autocomplete_history_manager_;
-
   scoped_ptr<AutofillManager> autofill_manager_;
-
   scoped_ptr<ExtensionTabHelper> extension_tab_helper_;
-
+  scoped_ptr<FaviconTabHelper> favicon_tab_helper_;
   scoped_ptr<FindTabHelper> find_tab_helper_;
 
   // PasswordManager and its delegate. The delegate must outlive the manager,