customtabs: Convert to the new AIDL interface, temporarily imported.

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/module_args/v8.gni")
 import("//chrome/version.gni")
 import("//testing/test.gni")
 import("//third_party/icu/config.gni")
@@ skipping 572 matching lines @@
   ]
   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/org/chromium/chrome/browser/customtabs"
-  interface_file = "java/src/org/chromium/chrome/browser/customtabs/common.aidl"
+  import_include = "java/src/android/support/customtabs"
+  interface_file = "java/src/android/support/customtabs/common.aidl"
   sources = [
-    "java/src/org/chromium/chrome/browser/customtabs/ICustomTabsConnectionCallback.aidl",
-    "java/src/org/chromium/chrome/browser/customtabs/ICustomTabsConnectionService.aidl",
+    "java/src/android/support/customtabs/ICustomTabsCallback.aidl",
+    "java/src/android/support/customtabs/ICustomTabsService.aidl",
   ]
 }
 
 # GYP: //chrome/android/chrome_apk.gyp:chrome_shared_test_java
 android_library("chrome_shared_test_java") {
   testonly = true
   DEPRECATED_java_in_dir = "javatests/src"
 
   deps = [
     "//base:base_java",
@@ skipping 133 matching lines @@
   # TODO(GYP,cjhopman): Does this need version code/name?
   apk_name = "ChromePublicTest"
   apk_under_test = ":chrome_public_apk"
   android_manifest = chrome_public_test_apk_manifest
   deps = [
     ":chrome_public_test_apk_manifest",
     "//chrome/android:chrome_shared_test_java",
   ]
   isolate_file = "../chrome_public_test_apk.isolate"
 }