Update instrumentation tests to use PreTestHooks for policies

components/components_tests.gyp

 # 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.
 
 {
   'variables': {
     # This turns on e.g. the filename-based detection of which
     # platforms to include source files on (e.g. files ending in
     # _mac.h or _mac.cc are only compiled on MacOSX).
     'chromium_code': 1,
@@ skipping 1549 matching lines @@
           'variables': {
             'test_suite_name': 'components_unittests',
           },
           'includes': [ '../build/apk_test.gypi' ],
         },
         {
           'target_name': 'components_junit_tests',
           'type': 'none',
           'dependencies': [
             'components.gyp:invalidation_java',
+            'components.gyp:policy_java',
+            'components.gyp:policy_java_test_support',
             '../base/base.gyp:base_java',
             '../base/base.gyp:base_java_test_support',
             '../testing/android/junit/junit_test.gyp:junit_test_support',
           ],
-          'conditions': [
-            ['configuration_policy == 1', {
-              'dependencies': [
-                'components.gyp:policy_java',
-              ],
-            }],
-          ],
           'variables': {
             'main_class': 'org.chromium.testing.local.JunitTestMain',
             'src_paths': [
               'invalidation/impl/android/junit/',
               'policy/android/junit/'
             ],
           },
           'includes': [ '../build/host_jar.gypi' ],
          },
       ],
@@ skipping 229 matching lines @@
               'dependencies': [
                 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }