Update instrumentation tests to use PreTestHooks for policies

components/policy.gypi

 # Copyright 2013 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.
 
 {
   'includes': [
     # Included to get 'mac_bundle_id' and other variables.
     '../build/chrome_settings.gypi',
   ],
   'variables': {
@@ skipping 337 matching lines @@
           ],
         },
       ],
     }],
     ['OS=="android"',
      {
       'targets' : [
         {
           'target_name' : 'policy_jni_headers',
           'type': 'none',
-          'sources': [ 
+          'sources': [
             'policy/android/java/src/org/chromium/policy/CombinedPolicyProvider.java',
             'policy/android/java/src/org/chromium/policy/PolicyConverter.java',
            ],
           'variables': {
             'jni_gen_package': 'policy',
            },
           'includes': [ '../build/jni_generator.gypi' ],
          },
        ],
     }],
@@ skipping 46 matching lines @@
           'target_name': 'policy_java',
           'type': 'none',
           'dependencies': [
             '../base/base.gyp:base_java',
           ],
           'variables': {
             'java_in_dir': 'policy/android/java',
           },
           'includes': [ '../build/java.gypi' ],
         },
+        {
+          # GN: //components/policy/android:policy_java_test_support
+          'target_name': 'policy_java_test_support',
+          'type': 'none',
+          'dependencies': [
+            '../base/base.gyp:base_java',
+            '../base/base.gyp:base_java_test_support',
+            'policy_java'
+          ],
+          'variables': {
+            'java_in_dir': 'policy/android/javatests',
+          },
+          'includes': [ '../build/java.gypi' ],
+        },
       ],
     }],
     ['OS=="win" and target_arch=="ia32" and configuration_policy==1', {
       'targets': [
         {
           'target_name': 'policy_win64',
           'type': 'static_library',
           'hard_dependency': 1,
           'sources': [
             '<(policy_constant_header_path)',
@@ skipping 119 matching lines @@
               'message':
                   'Copy the Localizable.strings files to the manifest bundle',
               'process_outputs_as_mac_bundle_resources': 1,
             },
           ],
         },
       ],
     }],
   ],
 }