Revert 80519 - Move favicon from TabContents to TabContentsWrapper.

chrome/browser/ui/tab_contents/tab_contents_wrapper.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_WRAPPER_H_
 #define CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_WRAPPER_H_
 #pragma once
 
 #include <string>
 
@@ skipping 13 matching lines @@
 class PrintPreviewMessageHandler;
 }
 
 class AutocompleteHistoryManager;
 class AutofillManager;
 class AutomationTabHelper;
 class DevToolsObserver;
 class Extension;
 class ExtensionMessageObserver;
 class ExtensionTabHelper;
-class FaviconTabHelper;
 class FileSelectObserver;
 class FindTabHelper;
 class NavigationController;
 class PasswordManager;
 class PasswordManagerDelegate;
 class SearchEngineTabHelper;
 class TabContentsWrapperDelegate;
 
 // Wraps TabContents and all of its supporting objects in order to control
 // their ownership and lifetime, while allowing TabContents to remain generic
@@ skipping 58 matching lines @@
 
   // Used only for testing/automation.
   AutomationTabHelper* automation_tab_helper() {
     return automation_tab_helper_.get();
   }
 
   ExtensionTabHelper* extension_tab_helper() {
     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(); }
 
   SearchEngineTabHelper* search_engine_tab_helper() {
     return search_engine_tab_helper_.get();
   }
 
   printing::PrintViewManager* print_view_manager() {
     return print_view_manager_.get();
@@ skipping 42 matching lines @@
   bool is_starred_;
 
   // Tab Helpers ---------------------------------------------------------------
   // (These provide API for callers and have a getter function listed in the
   // "Tab Helpers" section in the member functions area, above.)
 
   scoped_ptr<AutocompleteHistoryManager> autocomplete_history_manager_;
   scoped_ptr<AutofillManager> autofill_manager_;
   scoped_ptr<AutomationTabHelper> automation_tab_helper_;
   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,
   // per documentation in password_manager.h.
   scoped_ptr<PasswordManagerDelegate> password_manager_delegate_;
   scoped_ptr<PasswordManager> password_manager_;
 
   scoped_ptr<SearchEngineTabHelper> search_engine_tab_helper_;
 
   // Handles print job for this contents.
@@ skipping 13 matching lines @@
 
   // The supporting objects need to outlive the TabContents dtor (as they may
   // be called upon during its execution). As a result, this must come last
   // in the list.
   scoped_ptr<TabContents> tab_contents_;
 
   DISALLOW_COPY_AND_ASSIGN(TabContentsWrapper);
 };
 
 #endif  // CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_WRAPPER_H_