Start using the third_party/custom_tabs_client as support lib source

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 130 matching lines @@
     "//third_party/android_tools:android_gcm_java",
     "//third_party/android_tools:android_support_design_java",
     "//third_party/android_tools:android_support_design_resources",
     "//third_party/android_tools:android_support_v13_java",
     "//third_party/android_tools:android_support_v7_appcompat_java",
     "//third_party/android_tools:android_support_v7_mediarouter_java",
     "//third_party/android_tools:android_support_v7_mediarouter_resources",
     "//third_party/android_tools:android_support_v7_recyclerview_java",
     "//third_party/cacheinvalidation:cacheinvalidation_javalib",
     "//third_party/cacheinvalidation:cacheinvalidation_proto_java",
+    "//third_party/custom_tabs_client:custom_tabs_support_lib",
     "//third_party/gif_player:gif_player_java",
     "//third_party/jsr-305:jsr_305_javalib",
     "//third_party/leakcanary:leakcanary_java",
     "//ui/android:ui_java",
     "//ui/android:ui_java_resources",
     google_play_services_library,
   ]
 
   srcjar_deps = [
     ":chrome_android_java_enums_srcjar",
@@ skipping 10 matching lines @@
   # New versions of BuildConfig.java will be created when creating an apk.
   jar_excluded_patterns = [ "*/BuildConfig.class" ]
 
   # TODO(sievers): Split java code into components. Not everything
   # is really all that UI related here.
   if (android_java_ui) {
     # From java_sources.gni.
     java_files = chrome_java_sources
 
     srcjar_deps += [
-      ":custom_tabs_service_aidl",
       "//chrome:page_info_connection_type_javagen",
       "//chrome:website_settings_action_javagen",
       "//components/infobars/core:infobar_enums_java",
       "//components/offline_pages:offline_page_model_enums_java",
       "//components/omnibox/browser:autocomplete_match_javagen",
       "//components/omnibox/browser:autocomplete_match_type_javagen",
       "//components/security_state:security_state_enums_java",
       "//components/signin/core/browser:investigated_scenario_java",
     ]
 
@@ skipping 113 matching lines @@
   inputs = [
     chrome_version_java_file,
   ]
   output = "$target_gen_dir/$target_name.srcjar"
   base_dir = chrome_version_java_dir
   deps = [
     ":chrome_version_java",
   ]
 }
 
-#GYP: //chrome/android/chrome_apk.gyp:custom_tabs_service_aidl
-android_aidl("custom_tabs_service_aidl") {
-  import_include = "java/src/android/support/customtabs"
-  interface_file = "java/src/android/support/customtabs/common.aidl"
-  sources = [
-    "java/src/android/support/customtabs/ICustomTabsCallback.aidl",
-    "java/src/android/support/customtabs/ICustomTabsService.aidl",
-  ]
-}
-
 # GYP: //chrome/android/chrome_apk.gyp:chrome_test_java
 android_library("chrome_test_java") {
   testonly = true
 
   # From java_sources.gni.
   java_files = chrome_test_java_sources
 
   deps = [
     "//base:base_java",
     "//base:base_java_test_support",
@@ skipping 19 matching lines @@
     "//sync:sync_java_test_support",
     "//sync/android:sync_java",
     "//sync/android:sync_javatests",
     "//third_party/WebKit/public:blink_headers_java",
     "//third_party/android_tools:android_support_design_java",
     "//third_party/android_tools:android_support_v13_java",
     "//third_party/android_tools:android_support_v7_appcompat_java",
     "//third_party/android_tools:android_support_v7_recyclerview_java",
     "//third_party/android_tools:legacy_http_javalib",
     "//third_party/cacheinvalidation:cacheinvalidation_javalib",
+    "//third_party/custom_tabs_client:custom_tabs_support_lib",
     "//third_party/jsr-305:jsr_305_javalib",
     "//ui/android:ui_java",
     "//ui/android:ui_javatests",
     google_play_services_library,
   ]
 }
 
 # Overrides icon / name defined in chrome_java_resources.
 android_resources("chrome_public_apk_resources") {
   resource_dirs = [ "java/res_chromium" ]
@@ skipping 224 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
   deps = [
     ":chrome_sync_shell_test_apk_java",
     ":chrome_sync_shell_test_apk_manifest",
   ]
   proguard_enabled = !is_debug
 }