Index: chrome/chrome_tests.gypi |
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi |
index f024eb9f9dfd2526143703dd9a44a4d581120fe3..64c29fac95e3a215d55a27feb058e73b938ffdbb 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': [ |
'..', |
@@ -199,7 +199,6 @@ |
'test_support_common', |
'chrome_resources', |
'chrome_strings', |
- 'policy', |
'theme_resources', |
'../skia/skia.gyp:skia', |
'../testing/gtest.gyp:gtest', |
@@ -264,7 +263,6 @@ |
'test_support_common', |
'chrome_resources', |
'chrome_strings', |
- 'policy', |
'../skia/skia.gyp:skia', |
'../testing/gtest.gyp:gtest', |
], |
@@ -292,7 +290,6 @@ |
'msvs_guid': 'D2250C20-3A94-4FB9-AF73-11BC5B73884B', |
'dependencies': [ |
'browser', |
- 'policy', |
'renderer', |
'test_support_common', |
'test_support_ui', |
@@ -351,7 +348,6 @@ |
'chrome_resources', |
'chrome_strings', |
'debugger', |
- 'policy', |
'syncapi', |
'test_support_common', |
'test_support_ui', |
@@ -1009,7 +1005,6 @@ |
'common', |
'chrome_resources', |
'chrome_strings', |
- 'policy', |
'test_support_ui', |
'../base/base.gyp:base', |
'../build/temp_gyp/googleurl.gyp:googleurl', |
@@ -1077,7 +1072,6 @@ |
'chrome_resources', |
'chrome_strings', |
'common', |
- 'policy', |
'profile_import', |
'renderer', |
'service', |
@@ -1397,6 +1391,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', |
@@ -1406,7 +1401,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', |
@@ -2077,7 +2071,6 @@ |
'chrome', |
'chrome_resources', |
'chrome_strings', |
- 'policy', |
'profile_import', |
'renderer', |
'test_support_common', |
@@ -2458,7 +2451,6 @@ |
'msvs_guid': 'BBF2BC2F-7CD8-463E-BE88-CB81AAD92BFE', |
'dependencies': [ |
'chrome', |
- 'policy', |
'test_support_common', |
'../app/app.gyp:app_resources', |
'../base/base.gyp:base', |
@@ -2711,7 +2703,6 @@ |
'dependencies': [ |
'chrome', |
'debugger', |
- 'policy', |
'test_support_common', |
'test_support_ui', |
'theme_resources', |
@@ -2746,7 +2737,6 @@ |
'dependencies': [ |
'chrome', |
'debugger', |
- 'policy', |
'test_support_common', |
'test_support_ui', |
'theme_resources', |
@@ -2776,7 +2766,6 @@ |
'dependencies': [ |
'chrome', |
'debugger', |
- 'policy', |
'test_support_common', |
'test_support_ui', |
'theme_resources', |
@@ -2962,7 +2951,6 @@ |
'chrome', |
'chrome_resources', |
'common', |
- 'policy', |
'profile_import', |
'renderer', |
'chrome_strings', |
@@ -3122,7 +3110,6 @@ |
'chrome', |
'chrome_resources', |
'chrome_strings', |
- 'policy', |
'renderer', |
'test_support_common', |
'../app/app.gyp:app_base', |
@@ -3216,7 +3203,6 @@ |
'chrome', |
'chrome_resources', |
'chrome_strings', |
- 'policy', |
'test_support_common', |
'test_support_ui', |
'../skia/skia.gyp:skia', |
@@ -3325,7 +3311,6 @@ |
'dependencies': [ |
'test_support_common', |
'browser', |
- 'policy', |
'renderer', |
'syncapi', |
'../base/base.gyp:base', |
@@ -3403,7 +3388,6 @@ |
'dependencies': [ |
'chrome_resources', |
'chrome_strings', |
- 'policy', |
'test_support_common', |
'test_support_ui', |
'../skia/skia.gyp:skia', |
@@ -3459,7 +3443,6 @@ |
'product_prefix': '_', |
'dependencies': [ |
'chrome', |
- 'policy', |
'debugger', |
'syncapi', |
'test_support_common', |