[Android] Add an out-of-app instrumentation driver APK. (RELAND)

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 439 matching lines @@
 }
 
 # GYP: //chrome/chrome_tests.gypi:chrome_shell_test_apk
 android_apk("chrome_shell_test_apk") {
   testonly = true
   apk_under_test = ":chrome_shell_apk"
   deps = [
     ":chrome_javatests",
     ":chrome_shell_test_java",
     "//sync/android:sync_javatests",
+    "//testing/android/broker:broker_java",
     "//ui/android:ui_javatests",
   ]
+  datadeps = [
+    "//testing/android/driver:driver_apk",
+  ]
   apk_name = "ChromeShellTest"
   android_manifest = "shell/javatests/AndroidManifest.xml"
 }
 
 # GYP: //chrome/chrome_tests.gypi:chrome_junit_tests
 junit_binary("chrome_junit_tests") {
   java_files = [
     "junit/src/org/chromium/chrome/browser/omaha/ResponseParserTest.java",
     "junit/src/org/chromium/chrome/browser/media/remote/MediaUrlResolverTest.java",
     "junit/src/org/chromium/chrome/browser/media/remote/RemoteVideoInfoTest.java",
@@ skipping 66 matching lines @@
   ]
 }
 
 zip("chrome_version_srcjar") {
   inputs = [
     chrome_version_java_file,
   ]
   output = "$target_gen_dir/$target_name.srcjar"
   base_dir = chrome_version_java_dir
 }