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 924 matching lines @@
       'browser/android/recently_closed_tabs_bridge.h',
       'browser/android/resource_id.h',
       'browser/android/resource_mapper.cc',
       'browser/android/resource_mapper.h',
       'browser/android/rlz/revenue_stats.cc',
       'browser/android/rlz/revenue_stats.h',
       'browser/android/safe_browsing/safe_browsing_api_handler_bridge.cc',
       'browser/android/safe_browsing/safe_browsing_api_handler_bridge.h',
       'browser/android/seccomp_support_detector.cc',
       'browser/android/seccomp_support_detector.h',
+      'browser/android/service_tab_launcher.cc',
+      'browser/android/service_tab_launcher.h',
       'browser/android/sessions/session_tab_helper_android.cc',
       'browser/android/sessions/session_tab_helper_android.h',
       'browser/android/shortcut_helper.cc',
       'browser/android/shortcut_helper.h',
       'browser/android/shortcut_info.cc',
       'browser/android/shortcut_info.h',
       'browser/android/signin/account_management_screen_helper.cc',
       'browser/android/signin/account_management_screen_helper.h',
       'browser/android/signin/account_tracker_service_android.cc',
       'browser/android/signin/account_tracker_service_android.h',
@@ skipping 1079 matching lines @@
       'android/java/src/org/chromium/chrome/browser/prerender/ExternalPrerenderHandler.java',
       'android/java/src/org/chromium/chrome/browser/provider/ChromeBrowserProvider.java',
       'android/java/src/org/chromium/chrome/browser/push_messaging/PushMessagingServiceObserver.java',
       'android/java/src/org/chromium/chrome/browser/rappor/RapporServiceBridge.java',
       'android/java/src/org/chromium/chrome/browser/rlz/RevenueStats.java',
       'android/java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingApiBridge.java',
       'android/java/src/org/chromium/chrome/browser/ShortcutHelper.java',
       'android/java/src/org/chromium/chrome/browser/SSLClientCertificateRequest.java',
       'android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java',
       'android/java/src/org/chromium/chrome/browser/sessions/SessionTabHelper.java',
+      'android/java/src/org/chromium/chrome/browser/ServiceTabLauncher.java',
       'android/java/src/org/chromium/chrome/browser/signin/AccountManagementScreenHelper.java',
       'android/java/src/org/chromium/chrome/browser/signin/AccountTrackerService.java',
       'android/java/src/org/chromium/chrome/browser/signin/OAuth2TokenService.java',
       'android/java/src/org/chromium/chrome/browser/signin/SigninInvestigator.java',
       'android/java/src/org/chromium/chrome/browser/signin/SigninManager.java',
       'android/java/src/org/chromium/chrome/browser/snackbar/smartlockautosignin/AutoSigninSnackbarController.java',
       'android/java/src/org/chromium/chrome/browser/spellchecker/SpellCheckerSessionBridge.java',
       'android/java/src/org/chromium/chrome/browser/superviseduser/SupervisedUserContentProvider.java',
       'android/java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java',
       'android/java/src/org/chromium/chrome/browser/sync/SyncSessionsMetrics.java',
@@ skipping 1777 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',
           ],
         },
       ],
     }],
   ],
 }