customtabs: Convert to the new AIDL interface.

chrome/android/BUILD.gn

Index: chrome/android/BUILD.gn
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index 70a8dec2cc8500833420ce1bb70a442d762e41d4..5f9958c2766d805a5296179044b0555d987f81e4 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -135,6 +135,7 @@ android_library("chrome_java") {
     "//media/base/android:media_java",
     "//printing:printing_java",
     "//sync/android:sync_java",
+    "//third_party/android_customtabs:android_customtabs_lib",
     "//third_party/android_data_chart:android_data_chart_java",
     "//third_party/android_media:android_media_java",
     "//third_party/android_protobuf:protobuf_nano_javalib",
@@ -158,7 +159,6 @@ android_library("chrome_java") {
   srcjar_deps = [
     ":chrome_android_java_enums_srcjar",
     ":chrome_version_srcjar",
-    ":custom_tabs_service_aidl",
     ":resource_id_javagen",
     "//chrome:page_info_connection_type_javagen",
     "//chrome:content_setting_javagen",
@@ -598,16 +598,6 @@ zip("chrome_version_srcjar") {
   ]
 }
 
-#GYP: //chrome/android/chrome_apk.gyp:custom_tabs_service_aidl
-android_aidl("custom_tabs_service_aidl") {
-  import_include = "java/src/org/chromium/chrome/browser/customtabs"
-  interface_file = "java/src/org/chromium/chrome/browser/customtabs/common.aidl"
-  sources = [
-    "java/src/org/chromium/chrome/browser/customtabs/ICustomTabsConnectionCallback.aidl",
-    "java/src/org/chromium/chrome/browser/customtabs/ICustomTabsConnectionService.aidl",
-  ]
-}
-
 # GYP: //chrome/android/chrome_apk.gyp:chrome_shared_test_java
 android_library("chrome_shared_test_java") {
   testonly = true
@@ -632,6 +622,7 @@ android_library("chrome_shared_test_java") {
     "//printing:printing_java",
     "//sync/android:sync_java",
     "//sync:sync_java_test_support",
+    "//third_party/android_customtabs:android_customtabs_lib",
     "//third_party/android_tools:android_support_v7_appcompat_java",
     "//third_party/android_tools:android_support_v7_recyclerview_java",
     "//third_party/android_tools:android_support_v13_java",