Index: chrome/chrome_tests_unit.gypi |
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi |
index 1538b42c5f942a85bcc2eaaac52acedf8f7d6b1d..6382861eb8126d03c1b912593a2eecb566ad0323 100644 |
--- a/chrome/chrome_tests_unit.gypi |
+++ b/chrome/chrome_tests_unit.gypi |
@@ -144,10 +144,10 @@ |
'browser/password_manager/mock_password_store.h', |
'browser/password_manager/password_form_data.cc', |
'browser/password_manager/password_form_data.h', |
+ 'browser/policy/cloud/policy_builder.cc', |
+ 'browser/policy/cloud/policy_builder.h', |
'browser/policy/mock_configuration_policy_provider.cc', |
'browser/policy/mock_configuration_policy_provider.h', |
- 'browser/policy/policy_builder.cc', |
- 'browser/policy/policy_builder.h', |
'browser/prefs/mock_pref_change_callback.cc', |
'browser/prefs/mock_pref_change_callback.h', |
'browser/prefs/pref_service_mock_builder.cc', |
@@ -618,6 +618,15 @@ |
'browser/chromeos/net/network_portal_detector_unittest.cc', |
'browser/chromeos/net/onc_utils_unittest.cc', |
'browser/chromeos/offline/offline_load_page_unittest.cc', |
+ 'browser/chromeos/policy/auto_enrollment_client_unittest.cc', |
+ 'browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc', |
+ 'browser/chromeos/policy/device_cloud_policy_store_chromeos_unittest.cc', |
+ 'browser/chromeos/policy/device_local_account_policy_service_unittest.cc', |
+ 'browser/chromeos/policy/enterprise_install_attributes_unittest.cc', |
+ 'browser/chromeos/policy/network_configuration_updater_unittest.cc', |
+ 'browser/chromeos/policy/proxy_policy_provider_unittest.cc', |
+ 'browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc', |
+ 'browser/chromeos/policy/user_cloud_policy_store_chromeos_unittest.cc', |
'browser/chromeos/power/session_length_limiter_unittest.cc', |
'browser/chromeos/preferences_unittest.cc', |
'browser/chromeos/process_proxy/process_output_watcher_unittest.cc', |
@@ -926,37 +935,35 @@ |
'browser/plugins/plugin_metadata_unittest.cc', |
'browser/plugins/plugin_prefs_unittest.cc', |
'browser/policy/async_policy_provider_unittest.cc', |
- 'browser/policy/auto_enrollment_client_unittest.cc', |
'browser/policy/browser_policy_connector_unittest.cc', |
- 'browser/policy/cloud_policy_client_unittest.cc', |
- 'browser/policy/cloud_policy_core_unittest.cc', |
- 'browser/policy/cloud_policy_manager_unittest.cc', |
- 'browser/policy/cloud_policy_refresh_scheduler_unittest.cc', |
- 'browser/policy/cloud_policy_service_unittest.cc', |
- 'browser/policy/cloud_policy_validator_unittest.cc', |
+ 'browser/policy/cloud/cloud_policy_client_unittest.cc', |
+ 'browser/policy/cloud/cloud_policy_core_unittest.cc', |
+ 'browser/policy/cloud/cloud_policy_manager_unittest.cc', |
+ 'browser/policy/cloud/cloud_policy_refresh_scheduler_unittest.cc', |
+ 'browser/policy/cloud/cloud_policy_service_unittest.cc', |
+ 'browser/policy/cloud/cloud_policy_validator_unittest.cc', |
+ 'browser/policy/cloud/device_management_service_unittest.cc', |
+ 'browser/policy/cloud/mock_cloud_policy_client.cc', |
+ 'browser/policy/cloud/mock_cloud_policy_client.h', |
+ 'browser/policy/cloud/mock_cloud_policy_store.cc', |
+ 'browser/policy/cloud/mock_cloud_policy_store.h', |
+ 'browser/policy/cloud/mock_device_management_service.cc', |
+ 'browser/policy/cloud/mock_device_management_service.h', |
+ 'browser/policy/cloud/mock_user_cloud_policy_store.cc', |
+ 'browser/policy/cloud/mock_user_cloud_policy_store.h', |
+ 'browser/policy/cloud/user_cloud_policy_manager_unittest.cc', |
+ 'browser/policy/cloud/user_cloud_policy_store_unittest.cc', |
+ 'browser/policy/cloud/user_info_fetcher_unittest.cc', |
+ 'browser/policy/cloud/user_policy_signin_service_unittest.cc', |
'browser/policy/config_dir_policy_loader_unittest.cc', |
'browser/policy/configuration_policy_handler_chromeos_unittest.cc', |
'browser/policy/configuration_policy_handler_unittest.cc', |
'browser/policy/configuration_policy_pref_store_unittest.cc', |
'browser/policy/configuration_policy_provider_test.cc', |
'browser/policy/configuration_policy_provider_test.h', |
- 'browser/policy/device_cloud_policy_manager_chromeos_unittest.cc', |
- 'browser/policy/device_cloud_policy_store_chromeos_unittest.cc', |
- 'browser/policy/device_management_service_unittest.cc', |
- 'browser/policy/device_local_account_policy_service_unittest.cc', |
- 'browser/policy/enterprise_install_attributes_unittest.cc', |
'browser/policy/managed_mode_policy_provider_unittest.cc', |
- 'browser/policy/mock_cloud_policy_client.cc', |
- 'browser/policy/mock_cloud_policy_client.h', |
- 'browser/policy/mock_cloud_policy_store.cc', |
- 'browser/policy/mock_cloud_policy_store.h', |
- 'browser/policy/mock_device_management_service.cc', |
- 'browser/policy/mock_device_management_service.h', |
'browser/policy/mock_policy_service.cc', |
'browser/policy/mock_policy_service.h', |
- 'browser/policy/mock_user_cloud_policy_store.cc', |
- 'browser/policy/mock_user_cloud_policy_store.h', |
- 'browser/policy/network_configuration_updater_unittest.cc', |
'browser/policy/policy_bundle_unittest.cc', |
'browser/policy/policy_loader_mac_unittest.cc', |
'browser/policy/policy_loader_win_unittest.cc', |
@@ -966,14 +973,7 @@ |
'browser/policy/policy_statistics_collector_unittest.cc', |
'browser/policy/preferences_mock_mac.cc', |
'browser/policy/preferences_mock_mac.h', |
- 'browser/policy/proxy_policy_provider_unittest.cc', |
'browser/policy/url_blacklist_manager_unittest.cc', |
- 'browser/policy/user_cloud_policy_manager_chromeos_unittest.cc', |
- 'browser/policy/user_cloud_policy_manager_unittest.cc', |
- 'browser/policy/user_cloud_policy_store_chromeos_unittest.cc', |
- 'browser/policy/user_cloud_policy_store_unittest.cc', |
- 'browser/policy/user_info_fetcher_unittest.cc', |
- 'browser/policy/user_policy_signin_service_unittest.cc', |
'browser/predictors/autocomplete_action_predictor_table_unittest.cc', |
'browser/predictors/autocomplete_action_predictor_unittest.cc', |
'browser/predictors/resource_prefetch_predictor_unittest.cc', |
@@ -1886,20 +1886,20 @@ |
], |
}], |
['chromeos==1', { |
- 'sources/': [ |
- ['exclude', '^browser/password_manager/native_backend_gnome_x_unittest.cc'], |
- ['exclude', '^browser/password_manager/native_backend_kwallet_x_unittest.cc'], |
- ['exclude', '^browser/policy/mock_user_cloud_policy_store.cc' ], |
- ['exclude', '^browser/policy/mock_user_cloud_policy_store.h' ], |
- ['exclude', '^browser/policy/user_cloud_policy_manager_unittest.cc'], |
- ['exclude', '^browser/policy/user_cloud_policy_store_unittest.cc'], |
- ['exclude', '^browser/policy/user_policy_signin_service_unittest.cc'], |
- ['exclude', '^browser/safe_browsing/download_protection_service_unittest.cc' ], |
- ['exclude', '^browser/system_monitor/removable_device_notifications_linux_unittest.cc'], |
- ], |
'sources': [ |
'browser/ui/webui/feedback_ui_unittest.cc', |
], |
+ 'sources!': [ |
+ 'browser/password_manager/native_backend_gnome_x_unittest.cc', |
+ 'browser/password_manager/native_backend_kwallet_x_unittest.cc', |
+ 'browser/policy/cloud/mock_user_cloud_policy_store.cc' , |
+ 'browser/policy/cloud/mock_user_cloud_policy_store.h' , |
+ 'browser/policy/cloud/user_cloud_policy_manager_unittest.cc', |
+ 'browser/policy/cloud/user_cloud_policy_store_unittest.cc', |
+ 'browser/policy/cloud/user_policy_signin_service_unittest.cc', |
+ 'browser/safe_browsing/download_protection_service_unittest.cc' , |
+ 'browser/system_monitor/removable_device_notifications_linux_unittest.cc', |
+ ], |
}, { # else: chromeos == 0 |
'sources/': [ |
['exclude', '^browser/chromeos/'], |
@@ -1910,14 +1910,6 @@ |
], |
'sources!': [ |
'browser/net/gaia/gaia_oauth_fetcher_unittest.cc', |
- 'browser/policy/auto_enrollment_client_unittest.cc' , |
- 'browser/policy/cros_user_policy_cache_unittest.cc', |
- 'browser/policy/device_policy_cache_unittest.cc', |
- 'browser/policy/device_local_account_policy_service_unittest.cc', |
- 'browser/policy/device_status_collector_unittest.cc', |
- 'browser/policy/enterprise_install_attributes_unittest.cc', |
- 'browser/policy/network_configuration_updater_unittest.cc', |
- 'browser/policy/proxy_policy_provider_unittest.cc', |
], |
}], |
['toolkit_uses_gtk == 1', { |