Index: chrome/chrome_browser.gypi |
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi |
index ece6e8c49dca8ceb7b6d9e2fae901c397e780b98..dae192c110b75a3d9f85d94ce668af56350eb859 100644 |
--- a/chrome/chrome_browser.gypi |
+++ b/chrome/chrome_browser.gypi |
@@ -1459,50 +1459,8 @@ |
'browser/policy/autofill_policy_handler.h', |
'browser/policy/browser_policy_connector.cc', |
'browser/policy/browser_policy_connector.h', |
- 'browser/policy/cloud/cloud_external_data_manager.cc', |
- 'browser/policy/cloud/cloud_external_data_manager.h', |
- 'browser/policy/cloud/cloud_policy_client.cc', |
- 'browser/policy/cloud/cloud_policy_client.h', |
- 'browser/policy/cloud/cloud_policy_client_registration_helper.cc', |
- 'browser/policy/cloud/cloud_policy_client_registration_helper.h', |
- 'browser/policy/cloud/cloud_policy_constants.cc', |
- 'browser/policy/cloud/cloud_policy_constants.h', |
- 'browser/policy/cloud/cloud_policy_core.cc', |
- 'browser/policy/cloud/cloud_policy_core.h', |
'browser/policy/cloud/cloud_policy_invalidator.cc', |
'browser/policy/cloud/cloud_policy_invalidator.h', |
- 'browser/policy/cloud/cloud_policy_manager.cc', |
- 'browser/policy/cloud/cloud_policy_manager.h', |
- 'browser/policy/cloud/cloud_policy_refresh_scheduler.cc', |
- 'browser/policy/cloud/cloud_policy_refresh_scheduler.h', |
- 'browser/policy/cloud/cloud_policy_service.cc', |
- 'browser/policy/cloud/cloud_policy_service.h', |
- 'browser/policy/cloud/cloud_policy_store.cc', |
- 'browser/policy/cloud/cloud_policy_store.h', |
- 'browser/policy/cloud/cloud_policy_validator.cc', |
- 'browser/policy/cloud/cloud_policy_validator.h', |
- 'browser/policy/cloud/component_cloud_policy_service.cc', |
- 'browser/policy/cloud/component_cloud_policy_service.h', |
- 'browser/policy/cloud/component_cloud_policy_store.cc', |
- 'browser/policy/cloud/component_cloud_policy_store.h', |
- 'browser/policy/cloud/component_cloud_policy_updater.cc', |
- 'browser/policy/cloud/component_cloud_policy_updater.h', |
- 'browser/policy/cloud/device_management_service.cc', |
- 'browser/policy/cloud/device_management_service.h', |
- 'browser/policy/cloud/enterprise_metrics.cc', |
- 'browser/policy/cloud/enterprise_metrics.h', |
- 'browser/policy/cloud/external_policy_data_fetcher.cc', |
- 'browser/policy/cloud/external_policy_data_fetcher.h', |
- 'browser/policy/cloud/external_policy_data_updater.cc', |
- 'browser/policy/cloud/external_policy_data_updater.h', |
- 'browser/policy/cloud/message_util.cc', |
- 'browser/policy/cloud/message_util.h', |
- 'browser/policy/cloud/rate_limiter.cc', |
- 'browser/policy/cloud/rate_limiter.h', |
- 'browser/policy/cloud/resource_cache.cc', |
- 'browser/policy/cloud/resource_cache.h', |
- 'browser/policy/cloud/system_policy_request_context.cc', |
- 'browser/policy/cloud/system_policy_request_context.h', |
'browser/policy/cloud/user_cloud_policy_invalidator_factory.cc', |
'browser/policy/cloud/user_cloud_policy_invalidator_factory.h', |
'browser/policy/cloud/user_cloud_policy_invalidator.cc', |
@@ -1515,10 +1473,6 @@ |
'browser/policy/cloud/user_cloud_policy_store.h', |
'browser/policy/cloud/user_cloud_policy_store_base.cc', |
'browser/policy/cloud/user_cloud_policy_store_base.h', |
- 'browser/policy/cloud/user_info_fetcher.cc', |
- 'browser/policy/cloud/user_info_fetcher.h', |
- 'browser/policy/cloud/user_policy_request_context.cc', |
- 'browser/policy/cloud/user_policy_request_context.h', |
'browser/policy/cloud/user_policy_signin_service.cc', |
'browser/policy/cloud/user_policy_signin_service.h', |
'browser/policy/cloud/user_policy_signin_service_android.cc', |
@@ -1527,40 +1481,16 @@ |
'browser/policy/cloud/user_policy_signin_service_base.h', |
'browser/policy/cloud/user_policy_signin_service_factory.cc', |
'browser/policy/cloud/user_policy_signin_service_factory.h', |
- 'browser/policy/config_dir_policy_loader.cc', |
- 'browser/policy/config_dir_policy_loader.h', |
- 'browser/policy/configuration_policy_handler.cc', |
- 'browser/policy/configuration_policy_handler.h', |
'browser/policy/configuration_policy_handler_android.cc', |
'browser/policy/configuration_policy_handler_android.h', |
- 'browser/policy/configuration_policy_handler_list.cc', |
- 'browser/policy/configuration_policy_handler_list.h', |
'browser/policy/configuration_policy_handler_list_factory.cc', |
'browser/policy/configuration_policy_handler_list_factory.h', |
- 'browser/policy/configuration_policy_pref_store.cc', |
- 'browser/policy/configuration_policy_pref_store.h', |
'browser/policy/file_selection_dialogs_policy_handler.cc', |
'browser/policy/file_selection_dialogs_policy_handler.h', |
'browser/policy/javascript_policy_handler.cc', |
'browser/policy/javascript_policy_handler.h', |
- 'browser/policy/policy_load_status.cc', |
- 'browser/policy/policy_load_status.h', |
- 'browser/policy/policy_loader_mac.cc', |
- 'browser/policy/policy_loader_mac.h', |
- 'browser/policy/policy_loader_win.cc', |
- 'browser/policy/policy_loader_win.h', |
- 'browser/policy/policy_service.cc', |
- 'browser/policy/policy_service.h', |
- 'browser/policy/policy_service_impl.cc', |
- 'browser/policy/policy_service_impl.h', |
- 'browser/policy/policy_service_stub.cc', |
- 'browser/policy/policy_service_stub.h', |
- 'browser/policy/policy_statistics_collector.cc', |
- 'browser/policy/policy_statistics_collector.h', |
'browser/policy/policy_transformations.cc', |
'browser/policy/policy_transformations.h', |
- 'browser/policy/preg_parser_win.cc', |
- 'browser/policy/preg_parser_win.h', |
'browser/policy/profile_policy_connector.cc', |
'browser/policy/profile_policy_connector_stub.cc', |
'browser/policy/profile_policy_connector.h', |
@@ -2845,13 +2775,11 @@ |
}], |
['configuration_policy==1', { |
'sources!': [ |
- 'browser/policy/policy_service_stub.cc', |
- 'browser/policy/policy_service_stub.h', |
'browser/policy/profile_policy_connector_stub.cc', |
], |
'dependencies': [ |
'app/policy/cloud_policy_codegen.gyp:policy', |
- 'cloud_policy_proto', |
+ '../components/components.gyp:cloud_policy_proto', |
], |
'conditions': [ |
['OS!="android"', { |
@@ -2875,10 +2803,6 @@ |
['exclude', 'browser/sessions/restore_on_startup_policy_handler.h'], |
['exclude', 'browser/sync/sync_policy_handler.cc'], |
['exclude', 'browser/sync/sync_policy_handler.h'], |
- ['include', 'browser/policy/policy_service.cc'], |
- ['include', 'browser/policy/policy_service.h'], |
- ['include', 'browser/policy/policy_service_stub.cc'], |
- ['include', 'browser/policy/policy_service_stub.h'], |
['include', 'browser/policy/profile_policy_connector_stub.cc'], |
['include', 'browser/policy/profile_policy_connector.h'], |
['include', 'browser/policy/profile_policy_connector_factory.cc'], |
@@ -3004,8 +2928,6 @@ |
'browser/password_manager/native_backend_kwallet_x.cc', |
'browser/password_manager/native_backend_kwallet_x.h', |
'browser/platform_util_linux.cc', |
- 'browser/policy/cloud/cloud_policy_client_registration_helper.cc', |
- 'browser/policy/cloud/cloud_policy_client_registration_helper.h', |
'browser/policy/cloud/user_cloud_policy_manager.cc', |
'browser/policy/cloud/user_cloud_policy_manager.h', |
'browser/policy/cloud/user_cloud_policy_manager_factory.cc', |
@@ -3237,7 +3159,6 @@ |
'../third_party/libusb/libusb.gyp:libusb', |
], |
'sources': [ |
- 'browser/policy/cloud/component_cloud_policy_service_stub.cc', |
'browser/sessions/in_memory_tab_restore_service.cc', |
'browser/sessions/in_memory_tab_restore_service.h', |
'browser/signin/android_profile_oauth2_token_service.cc', |
@@ -3264,21 +3185,8 @@ |
'browser/download/download_crx_util.cc', |
'browser/net/gaia/gaia_oauth_fetcher.cc', |
- 'browser/policy/cloud/component_cloud_policy_service.cc', |
- 'browser/policy/cloud/component_cloud_policy_store.cc', |
- 'browser/policy/cloud/component_cloud_policy_store.h', |
- 'browser/policy/cloud/component_cloud_policy_updater.cc', |
- 'browser/policy/cloud/component_cloud_policy_updater.h', |
- 'browser/policy/cloud/external_policy_data_fetcher.cc', |
- 'browser/policy/cloud/external_policy_data_fetcher.h', |
- 'browser/policy/cloud/external_policy_data_updater.cc', |
- 'browser/policy/cloud/external_policy_data_updater.h', |
- 'browser/policy/cloud/resource_cache.cc', |
- 'browser/policy/cloud/resource_cache.h', |
'browser/policy/cloud/user_policy_signin_service.cc', |
'browser/policy/cloud/user_policy_signin_service.h', |
- 'browser/policy/config_dir_policy_loader.cc', |
- 'browser/policy/config_dir_policy_loader.h', |
'browser/sessions/persistent_tab_restore_service.cc', |
'browser/sessions/persistent_tab_restore_service.h', |
'browser/sessions/session_backend.cc', |
@@ -3329,7 +3237,6 @@ |
'browser/parsers/metadata_parser_jpeg.cc', |
'browser/parsers/metadata_parser_jpeg_factory.cc', |
'browser/parsers/metadata_parser_manager.cc', |
- 'browser/policy/policy_load_status.cc', |
'browser/policy/proto/cloud/chrome_extension_policy.proto', |
'browser/process_singleton.cc', |
'browser/process_singleton_modal_dialog_lock.cc', |
@@ -3639,21 +3546,6 @@ |
}, |
'includes': [ '../build/protoc.gypi' ] |
}, |
- { |
- # Protobuf compiler / generator for cloud policy protocol buffers. |
- 'target_name': 'cloud_policy_proto', |
- 'type': 'static_library', |
- 'sources': [ |
- 'browser/policy/proto/cloud/chrome_extension_policy.proto', |
- 'browser/policy/proto/cloud/device_management_backend.proto', |
- 'browser/policy/proto/cloud/device_management_local.proto', |
- ], |
- 'variables': { |
- 'proto_in_dir': 'browser/policy/proto/cloud', |
- 'proto_out_dir': 'chrome/browser/policy/proto/cloud', |
- }, |
- 'includes': [ '../build/protoc.gypi' ] |
- }, |
], |
'conditions': [ |
['OS=="android"', { |