Update instrumentation tests to use PreTestHooks for policies

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 296 matching lines @@
     "//base:base_java_test_support",
     "//chrome/android:chrome_java",
     "//chrome/android:chrome_java_resources",
     "//chrome/test/android:chrome_java_test_support",
     "//components/bookmarks/common/android:bookmarks_java",
     "//components/dom_distiller/android:dom_distiller_core_java",
     "//components/invalidation/impl:java",
     "//components/invalidation/impl:javatests",
     "//components/navigation_interception/android:navigation_interception_java",
     "//components/policy/android:policy_java",
+    "//components/policy/android:policy_java_test_support",

[aberent, 2015/10/07 11:13:02]

Should there be a matching change to chrome_apk.gyp:chrome_shared_test_java?

[dgn, 2015/10/07 14:36:57]

Thanks, it was not needed since the dependency is added via 
//chrome/test/android:chrome_java_test_support

     "//components/precache/android:precache_java",
     "//components/precache/android:precache_javatests",
     "//components/web_contents_delegate_android:web_contents_delegate_android_java",
     "//content/public/android:content_java",
     "//content/public/test/android:content_java_test_support",
     "//net/android:net_java",
     "//net/android:net_java_test_support",
     "//printing:printing_java",
     "//sync/android:sync_java",
     "//sync/android:sync_javatests",
@@ skipping 130 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"
 }