Revert 80519 - Move favicon from TabContents to TabContentsWrapper.

chrome/chrome_browser.gypi

 # 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.
 
 {
   'targets': [
     {
       'target_name': 'browser',
       'type': '<(library)',
       'msvs_guid': '5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA',
@@ skipping 1031 matching lines @@
         'browser/extensions/theme_installed_infobar_delegate.cc',
         'browser/extensions/theme_installed_infobar_delegate.h',
         'browser/extensions/user_script_listener.cc',
         'browser/extensions/user_script_listener.h',
         'browser/extensions/user_script_master.cc',
         'browser/extensions/user_script_master.h',
         'browser/external_protocol_handler.cc',
         'browser/external_protocol_handler.h',
         'browser/external_tab_container_win.cc',
         'browser/external_tab_container_win.h',
+        'browser/favicon_helper.cc',
+        'browser/favicon_helper.h',
         'browser/favicon_service.cc',
         'browser/favicon_service.h',
-        'browser/favicon_tab_helper.cc',
-        'browser/favicon_tab_helper.h',
         'browser/file_select_helper.cc',
         'browser/file_select_helper.h',
         'browser/first_run/first_run.cc',
         'browser/first_run/first_run.h',
         'browser/first_run/first_run_gtk.cc',
         'browser/first_run/first_run_mac.mm',
         'browser/first_run/first_run_win.cc',
         'browser/fullscreen.h',
         'browser/fullscreen_linux.cc',
         'browser/fullscreen_mac.mm',
@@ skipping 3336 matching lines @@
       'hard_dependency': 1,
     },
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: