Merge ChromeServiceTabLauncher and ServiceTabLauncher

chrome/chrome_browser.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.
 
 {
   'variables': {
     # All .cc, .h, .m, and .mm files under browser except for:
     # * tests and mocks.
     # * code below browser/chromeos
     # * code below browser/extensions
@@ skipping 707 matching lines @@
       'browser/android/bottombar/overlay_panel_content.cc',
       'browser/android/bottombar/overlay_panel_content.h',
       'browser/android/browsing_data/browsing_data_counter_bridge.cc',
       'browser/android/browsing_data/browsing_data_counter_bridge.h',
       'browser/android/chrome_application.cc',
       'browser/android/chrome_application.h',
       'browser/android/chrome_feature_list.cc',
       'browser/android/chrome_feature_list.h',
       'browser/android/chrome_jni_registrar.cc',
       'browser/android/chrome_jni_registrar.h',
+      'browser/android/chrome_service_tab_launcher.cc',
+      'browser/android/chrome_service_tab_launcher.h',
       'browser/android/chrome_startup_flags.cc',
       'browser/android/chrome_startup_flags.h',
       'browser/android/compositor/compositor_view.cc',
       'browser/android/compositor/compositor_view.h',
       'browser/android/compositor/decoration_title.cc',
       'browser/android/compositor/decoration_title.h',
       'browser/android/compositor/layer/content_layer.cc',
       'browser/android/compositor/layer/content_layer.h',
       'browser/android/compositor/layer/contextual_search_layer.cc',
       'browser/android/compositor/layer/contextual_search_layer.h',
@@ skipping 1204 matching lines @@
       'android/java/src/org/chromium/chrome/browser/autofill/PersonalDataManager.java',
       'android/java/src/org/chromium/chrome/browser/BackgroundSyncLauncher.java',
       'android/java/src/org/chromium/chrome/browser/BluetoothChooserDialog.java',
       'android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java',
       'android/java/src/org/chromium/chrome/browser/banners/AppBannerManager.java',
       'android/java/src/org/chromium/chrome/browser/childaccounts/ChildAccountService.java',
       'android/java/src/org/chromium/chrome/browser/childaccounts/ChildAccountFeedbackReporter.java',
       'android/java/src/org/chromium/chrome/browser/ChromeApplication.java',
       'android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java',
       'android/java/src/org/chromium/chrome/browser/ChromeHttpAuthHandler.java',
+      'android/java/src/org/chromium/chrome/browser/ChromeServiceTabLauncher.java',
       'android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java',
       'android/java/src/org/chromium/chrome/browser/compositor/CompositorView.java',
       'android/java/src/org/chromium/chrome/browser/compositor/LayerTitleCache.java',
       'android/java/src/org/chromium/chrome/browser/compositor/layouts/content/TabContentManager.java',
       'android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ContextualSearchSceneLayer.java',
       'android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ReaderModeSceneLayer.java',
       'android/java/src/org/chromium/chrome/browser/compositor/scene_layer/SceneLayer.java',
       'android/java/src/org/chromium/chrome/browser/compositor/scene_layer/StaticTabSceneLayer.java',
       'android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabListSceneLayer.java',
       'android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabStripSceneLayer.java',
@@ skipping 1869 matching lines @@
            ],
           'conditions': [
             ['android_java_ui==1', {
               'dependencies': [
                 '../components/components.gyp:browsing_data_ui',
                 '../components/components.gyp:data_usage_android',
                 '../components/components.gyp:offline_pages',
                 '../components/components.gyp:precache_content',
                 '../components/components.gyp:precache_core',
                 '../components/components.gyp:security_state',
-                '../components/components.gyp:service_tab_launcher',
                 '../components/components.gyp:toolbar',
                 '../components/components.gyp:web_contents_delegate_android',
                 'chrome_browser_jni_headers',
                 'client_discourse_context_proto',
                 'delta_file_proto',
               ],
               'sources': [
                 '<@(chrome_browser_android_java_ui_sources)',
                 '<@(chrome_browser_offline_pages_sources)',
                 '<@(chrome_browser_sync_android_java_ui_sources)',
@@ skipping 449 matching lines @@
             '../components/components.gyp:rlz',
             '../components/components.gyp:search_engines',
             '../rlz/rlz.gyp:rlz_lib',
             'common',
           ],
         },
       ],
     }],
   ],
 }