Merge ChromeServiceTabLauncher and ServiceTabLauncher

components/service_tab_launcher/BUILD.gn

Index: components/service_tab_launcher/BUILD.gn
diff --git a/components/service_tab_launcher/BUILD.gn b/components/service_tab_launcher/BUILD.gn
deleted file mode 100644
index afc17e1de4b83ad457ca11188cdc8f983981e1de..0000000000000000000000000000000000000000
--- a/components/service_tab_launcher/BUILD.gn
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2015 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/rules.gni")
-
-# GYP: //components/service_tab_launcher:service_tab_launcher
-static_library("service_tab_launcher") {
-  sources = [
-    "browser/android/service_tab_launcher.cc",
-    "browser/android/service_tab_launcher.h",
-    "component_jni_registrar.cc",
-    "component_jni_registrar.h",
-  ]
-
-  deps = [
-    ":service_tab_launcher_jni_headers",
-    "//base",
-    "//content/public/browser",
-  ]
-}
-
-# GYP: //components/service_tab_launcher:service_tab_launcher_java
-android_library("service_tab_launcher_java") {
-  deps = [
-    "//base:base_java",
-    "//content/public/android:content_java",
-  ]
-  java_files = [ "android/java/src/org/chromium/components/service_tab_launcher/ServiceTabLauncher.java" ]
-}
-
-# GYP: //components/service_tab_launcher:service_tab_launcher_jni_headers
-generate_jni("service_tab_launcher_jni_headers") {
-  sources = [
-    "android/java/src/org/chromium/components/service_tab_launcher/ServiceTabLauncher.java",
-  ]
-  jni_package = "service_tab_launcher"
-}