| Index: chrome/chrome_tests.gypi
 | 
| diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
 | 
| index f9ca35800033efe16c0c51bbbb24da24623afff9..b9066099aefb0eab045dd45cb4626ae7d5bef8a4 100644
 | 
| --- a/chrome/chrome_tests.gypi
 | 
| +++ b/chrome/chrome_tests.gypi
 | 
| @@ -29,9 +29,8 @@
 | 
|          'chrome_gpu',
 | 
|          'chrome_resources',
 | 
|          'chrome_strings',
 | 
| +        'app/policy/cloud_policy_codegen.gyp:policy',
 | 
|          'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp',
 | 
| -        'browser/policy/proto/device_management_proto.gyp:device_management_proto_cpp',
 | 
| -        'policy',
 | 
|          'theme_resources',
 | 
|          '../base/base.gyp:test_support_base',
 | 
|          '../ipc/ipc.gyp:test_support_ipc',
 | 
| @@ -44,6 +43,7 @@
 | 
|        ],
 | 
|        'export_dependent_settings': [
 | 
|          'renderer',
 | 
| +        'app/policy/cloud_policy_codegen.gyp:policy',
 | 
|        ],
 | 
|        'include_dirs': [
 | 
|          '..',
 | 
| @@ -204,7 +204,6 @@
 | 
|          'test_support_common',
 | 
|          'chrome_resources',
 | 
|          'chrome_strings',
 | 
| -        'policy',
 | 
|          'theme_resources',
 | 
|          '../skia/skia.gyp:skia',
 | 
|          '../testing/gtest.gyp:gtest',
 | 
| @@ -269,7 +268,6 @@
 | 
|          'test_support_common',
 | 
|          'chrome_resources',
 | 
|          'chrome_strings',
 | 
| -        'policy',
 | 
|          '../skia/skia.gyp:skia',
 | 
|          '../testing/gtest.gyp:gtest',
 | 
|        ],
 | 
| @@ -297,7 +295,6 @@
 | 
|        'msvs_guid': 'D2250C20-3A94-4FB9-AF73-11BC5B73884B',
 | 
|        'dependencies': [
 | 
|          'browser',
 | 
| -        'policy',
 | 
|          'renderer',
 | 
|          'test_support_common',
 | 
|          'test_support_ui',
 | 
| @@ -356,7 +353,6 @@
 | 
|          'chrome_resources',
 | 
|          'chrome_strings',
 | 
|          'debugger',
 | 
| -        'policy',
 | 
|          'syncapi',
 | 
|          'test_support_common',
 | 
|          'test_support_ui',
 | 
| @@ -1022,7 +1018,6 @@
 | 
|          'common',
 | 
|          'chrome_resources',
 | 
|          'chrome_strings',
 | 
| -        'policy',
 | 
|          'test_support_ui',
 | 
|          '../base/base.gyp:base',
 | 
|          '../build/temp_gyp/googleurl.gyp:googleurl',
 | 
| @@ -1090,7 +1085,6 @@
 | 
|          'chrome_resources',
 | 
|          'chrome_strings',
 | 
|          'common',
 | 
| -        'policy',
 | 
|          'profile_import',
 | 
|          'renderer',
 | 
|          'service',
 | 
| @@ -1408,6 +1402,7 @@
 | 
|          'browser/policy/asynchronous_policy_provider_unittest.cc',
 | 
|          'browser/policy/asynchronous_policy_test_base.cc',
 | 
|          'browser/policy/asynchronous_policy_test_base.h',
 | 
| +        'browser/policy/cloud_policy_cache_unittest.cc',
 | 
|          'browser/policy/config_dir_policy_provider_unittest.cc',
 | 
|          'browser/policy/configuration_policy_pref_store_unittest.cc',
 | 
|          'browser/policy/configuration_policy_provider_mac_unittest.cc',
 | 
| @@ -1417,7 +1412,6 @@
 | 
|          'browser/policy/device_management_backend_mock.cc',
 | 
|          'browser/policy/device_management_backend_mock.h',
 | 
|          'browser/policy/device_management_service_unittest.cc',
 | 
| -        'browser/policy/device_management_policy_cache_unittest.cc',
 | 
|          'browser/policy/device_management_policy_provider_unittest.cc',
 | 
|          'browser/policy/managed_prefs_banner_base_unittest.cc',
 | 
|          'browser/policy/mock_configuration_policy_provider.cc',
 | 
| @@ -2091,7 +2085,6 @@
 | 
|          'chrome',
 | 
|          'chrome_resources',
 | 
|          'chrome_strings',
 | 
| -        'policy',
 | 
|          'profile_import',
 | 
|          'renderer',
 | 
|          'test_support_common',
 | 
| @@ -2472,7 +2465,6 @@
 | 
|        'msvs_guid': 'BBF2BC2F-7CD8-463E-BE88-CB81AAD92BFE',
 | 
|        'dependencies': [
 | 
|          'chrome',
 | 
| -        'policy',
 | 
|          'test_support_common',
 | 
|          '../app/app.gyp:app_resources',
 | 
|          '../base/base.gyp:base',
 | 
| @@ -2725,7 +2717,6 @@
 | 
|        'dependencies': [
 | 
|          'chrome',
 | 
|          'debugger',
 | 
| -        'policy',
 | 
|          'test_support_common',
 | 
|          'test_support_ui',
 | 
|          'theme_resources',
 | 
| @@ -2760,7 +2751,6 @@
 | 
|        'dependencies': [
 | 
|          'chrome',
 | 
|          'debugger',
 | 
| -        'policy',
 | 
|          'test_support_common',
 | 
|          'test_support_ui',
 | 
|          'theme_resources',
 | 
| @@ -2790,7 +2780,6 @@
 | 
|        'dependencies': [
 | 
|          'chrome',
 | 
|          'debugger',
 | 
| -        'policy',
 | 
|          'test_support_common',
 | 
|          'test_support_ui',
 | 
|          'theme_resources',
 | 
| @@ -2975,7 +2964,6 @@
 | 
|          'chrome',
 | 
|          'chrome_resources',
 | 
|          'common',
 | 
| -        'policy',
 | 
|          'profile_import',
 | 
|          'renderer',
 | 
|          'chrome_strings',
 | 
| @@ -3134,7 +3122,6 @@
 | 
|          'chrome',
 | 
|          'chrome_resources',
 | 
|          'chrome_strings',
 | 
| -        'policy',
 | 
|          'renderer',
 | 
|          'test_support_common',
 | 
|          '../app/app.gyp:app_base',
 | 
| @@ -3228,7 +3215,6 @@
 | 
|          'chrome',
 | 
|          'chrome_resources',
 | 
|          'chrome_strings',
 | 
| -        'policy',
 | 
|          'test_support_common',
 | 
|          'test_support_ui',
 | 
|          '../skia/skia.gyp:skia',
 | 
| @@ -3337,7 +3323,6 @@
 | 
|            'dependencies': [
 | 
|              'test_support_common',
 | 
|              'browser',
 | 
| -            'policy',
 | 
|              'renderer',
 | 
|              'syncapi',
 | 
|              '../base/base.gyp:base',
 | 
| @@ -3415,7 +3400,6 @@
 | 
|            'dependencies': [
 | 
|              'chrome_resources',
 | 
|              'chrome_strings',
 | 
| -            'policy',
 | 
|              'test_support_common',
 | 
|              'test_support_ui',
 | 
|              '../skia/skia.gyp:skia',
 | 
| @@ -3471,7 +3455,6 @@
 | 
|            'product_prefix': '_',
 | 
|            'dependencies': [
 | 
|              'chrome',
 | 
| -            'policy',
 | 
|              'debugger',
 | 
|              'syncapi',
 | 
|              'test_support_common',
 | 
| 
 |