Unify desktop and Android tab helper instantiation.

chrome/chrome_browser_ui.gypi

 # Copyright 2012 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_ui',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
@@ skipping 453 matching lines @@
         'browser/ui/browser_list.h',
         'browser/ui/browser_mac.cc',
         'browser/ui/browser_mac.h',
         'browser/ui/browser_navigator.cc',
         'browser/ui/browser_navigator.h',
         'browser/ui/browser_otr_state_android.cc',
         'browser/ui/browser_otr_state.cc',
         'browser/ui/browser_otr_state.h',
         'browser/ui/browser_ui_prefs.cc',
         'browser/ui/browser_ui_prefs.h',
-        'browser/ui/browser_tab_contents.h',
-        'browser/ui/browser_tab_contents.cc',
         'browser/ui/browser_tab_restore_service_delegate.cc',
         'browser/ui/browser_tab_restore_service_delegate.h',
         'browser/ui/browser_tab_strip_model_delegate.cc',
         'browser/ui/browser_tab_strip_model_delegate.h',
         'browser/ui/browser_tabrestore.cc',
         'browser/ui/browser_tabrestore.h',
         'browser/ui/browser_tabstrip.cc',
         'browser/ui/browser_tabstrip.h',
         'browser/ui/browser_toolbar_model_delegate.cc',
         'browser/ui/browser_toolbar_model_delegate.h',
@@ skipping 1118 matching lines @@
         'browser/ui/sync/sync_promo_ui.h',
         'browser/ui/sync/tab_contents_synced_tab_delegate.cc',
         'browser/ui/sync/tab_contents_synced_tab_delegate.h',
         'browser/ui/tab_contents/chrome_web_contents_view_delegate.h',
         'browser/ui/tab_contents/core_tab_helper.cc',
         'browser/ui/tab_contents/core_tab_helper.h',
         'browser/ui/tab_contents/core_tab_helper_delegate.cc',
         'browser/ui/tab_contents/core_tab_helper_delegate.h',
         'browser/ui/tab_contents/tab_contents_iterator.cc',
         'browser/ui/tab_contents/tab_contents_iterator.h',
+        'browser/ui/tab_helpers.h',
+        'browser/ui/tab_helpers.cc',
         'browser/ui/tab_modal_confirm_dialog.h',
         'browser/ui/tab_modal_confirm_dialog_delegate.cc',
         'browser/ui/tab_modal_confirm_dialog_delegate.h',
         'browser/ui/tabs/dock_info.cc',
         'browser/ui/tabs/dock_info.h',
         'browser/ui/tabs/hover_tab_selector.cc',
         'browser/ui/tabs/hover_tab_selector.h',
         'browser/ui/tabs/pinned_tab_codec.cc',
         'browser/ui/tabs/pinned_tab_codec.h',
         'browser/ui/tabs/pinned_tab_service.cc',
@@ skipping 1411 matching lines @@
             'browser/ui/bookmarks/bookmark_bubble_sign_in_delegate.cc',
             'browser/ui/bookmarks/bookmark_bubble_sign_in_delegate.h',
             'browser/ui/bookmarks/bookmark_context_menu_controller.cc',
             'browser/ui/bookmarks/bookmark_prompt_controller.cc',
             'browser/ui/browser.cc',
             'browser/ui/browser_command_controller.cc',
             'browser/ui/browser_finder.cc',
             'browser/ui/browser_iterator.cc',
             'browser/ui/browser_list.cc',
             'browser/ui/browser_otr_state.cc',
-            'browser/ui/browser_tab_contents.cc',
             'browser/ui/browser_tab_restore_service_delegate.cc',
             'browser/ui/browser_tabstrip.cc',
             'browser/ui/browser_tabstrip.h',
             'browser/ui/chrome_pages.cc',
             'browser/ui/chrome_pages.h',
             'browser/ui/extensions/extension_install_ui_default.cc',
             'browser/ui/extensions/extension_install_ui_default.h',
             'browser/ui/ntp_background_util.cc',
             'browser/ui/ntp_background_util.h',
             'browser/ui/sad_tab_helper.cc',
@@ skipping 330 matching lines @@
             'browser/ui/webui/local_discovery/local_discovery_ui.cc',
             'browser/ui/webui/local_discovery/local_discovery_ui.h',
             'browser/ui/webui/local_discovery/local_discovery_ui_handler.cc',
             'browser/ui/webui/local_discovery/local_discovery_ui_handler.h',
           ],
         }],
       ],
     },
   ],
 }