Merge ChromeServiceTabLauncher and ServiceTabLauncher

chrome/android/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/config/android/config.gni")
 import("//build/config/android/rules.gni")
 import("//build_overrides/v8.gni")
 import("//chrome/android/chrome_public_apk_tmpl.gni")
 import("//chrome/common/features.gni")
 import("//chrome/version.gni")
@@ skipping 186 matching lines @@
       "//components/dom_distiller/android:dom_distiller_content_java",
       "//components/dom_distiller/android:dom_distiller_core_java",
       "//components/gcm_driver/android:gcm_driver_java",
       "//components/gcm_driver/instance_id/android:instance_id_driver_java",
       "//components/invalidation/impl:java",
       "//components/location/android:location_java",
       "//components/navigation_interception/android:navigation_interception_java",
       "//components/policy/android:policy_java",
       "//components/precache/android:precache_java",
       "//components/safe_json/android:safe_json_java",
-      "//components/service_tab_launcher:service_tab_launcher_java",
       "//components/signin/core/browser/android:java",
       "//components/web_contents_delegate_android:web_contents_delegate_android_java",
       "//sync/android:sync_java",
     ]
   }
 }
 
 # GYP: //chrome/chrome_browser.gypi:activity_type_ids_java
 # GYP: //chrome/chrome_browser.gypi:connectivity_check_result_java
 # GYP: //chrome/chrome_browser.gypi:shortcut_source_java
@@ skipping 374 matching lines @@
 instrumentation_test_apk("chrome_sync_shell_test_apk") {
   apk_name = "ChromeSyncShellTest"
   apk_under_test = ":chrome_sync_shell_apk"
   android_manifest = chrome_sync_shell_test_apk_manifest
   android_manifest_dep = ":chrome_sync_shell_test_apk_manifest"
   deps = [
     ":chrome_sync_shell_test_apk_java",
   ]
   proguard_enabled = !is_java_debug
 }