Index: components/sync/BUILD.gn |
diff --git a/components/sync/BUILD.gn b/components/sync/BUILD.gn |
index 7b5291e37b0236ec9fea1c0f655c85bf8eeb2084..91d8904f903190fc4152d1b49a6aecf0357fb8a1 100644 |
--- a/components/sync/BUILD.gn |
+++ b/components/sync/BUILD.gn |
@@ -217,6 +217,22 @@ static_library("sync") { |
"core_impl/syncapi_internal.h", |
"core_impl/syncapi_server_connection_manager.cc", |
"core_impl/syncapi_server_connection_manager.h", |
+ "device_info/device_count_metrics_provider.cc", |
+ "device_info/device_count_metrics_provider.h", |
+ "device_info/device_info.cc", |
+ "device_info/device_info.h", |
+ "device_info/device_info_data_type_controller.cc", |
+ "device_info/device_info_data_type_controller.h", |
+ "device_info/device_info_service.cc", |
+ "device_info/device_info_service.h", |
+ "device_info/device_info_sync_service.cc", |
+ "device_info/device_info_sync_service.h", |
+ "device_info/device_info_tracker.h", |
+ "device_info/device_info_util.cc", |
+ "device_info/device_info_util.h", |
+ "device_info/local_device_info_provider.h", |
+ "device_info/local_device_info_provider_impl.cc", |
+ "device_info/local_device_info_provider_impl.h", |
"driver/about_sync_util.cc", |
"driver/about_sync_util.h", |
"driver/backend_data_type_configurer.cc", |
@@ -236,19 +252,6 @@ static_library("sync") { |
"driver/data_type_manager_observer.h", |
"driver/data_type_status_table.cc", |
"driver/data_type_status_table.h", |
- "driver/device_count_metrics_provider.cc", |
- "driver/device_count_metrics_provider.h", |
- "driver/device_info.cc", |
- "driver/device_info.h", |
- "driver/device_info_data_type_controller.cc", |
- "driver/device_info_data_type_controller.h", |
- "driver/device_info_service.cc", |
- "driver/device_info_service.h", |
- "driver/device_info_sync_service.cc", |
- "driver/device_info_sync_service.h", |
- "driver/device_info_tracker.h", |
- "driver/device_info_util.cc", |
- "driver/device_info_util.h", |
"driver/directory_data_type_controller.cc", |
"driver/directory_data_type_controller.h", |
"driver/frontend_data_type_controller.cc", |
@@ -275,9 +278,6 @@ static_library("sync") { |
"driver/invalidation_adapter.h", |
"driver/invalidation_helper.cc", |
"driver/invalidation_helper.h", |
- "driver/local_device_info_provider.h", |
- "driver/local_device_info_provider_impl.cc", |
- "driver/local_device_info_provider_impl.h", |
"driver/model_association_manager.cc", |
"driver/model_association_manager.h", |
"driver/model_associator.h", |
@@ -736,6 +736,8 @@ static_library("test_support_sync_api") { |
static_library("test_support_sync_driver") { |
testonly = true |
sources = [ |
+ "device_info/local_device_info_provider_mock.cc", |
+ "device_info/local_device_info_provider_mock.h", |
"driver/change_processor_mock.cc", |
"driver/change_processor_mock.h", |
"driver/data_type_controller_mock.cc", |
@@ -754,8 +756,6 @@ static_library("test_support_sync_driver") { |
"driver/frontend_data_type_controller_mock.h", |
"driver/glue/sync_backend_host_mock.cc", |
"driver/glue/sync_backend_host_mock.h", |
- "driver/local_device_info_provider_mock.cc", |
- "driver/local_device_info_provider_mock.h", |
"driver/model_associator_mock.cc", |
"driver/model_associator_mock.h", |
"driver/non_ui_data_type_controller_mock.cc", |
@@ -833,21 +833,21 @@ source_set("unit_tests") { |
"core_impl/sync_encryption_handler_impl_unittest.cc", |
"core_impl/sync_manager_impl_unittest.cc", |
"core_impl/syncapi_server_connection_manager_unittest.cc", |
+ "device_info/device_count_metrics_provider_unittest.cc", |
+ "device_info/device_info_data_type_controller_unittest.cc", |
+ "device_info/device_info_service_unittest.cc", |
+ "device_info/device_info_sync_service_unittest.cc", |
+ "device_info/device_info_util_unittest.cc", |
+ "device_info/local_device_info_provider_unittest.cc", |
"driver/about_sync_util_unittest.cc", |
"driver/backend_migrator_unittest.cc", |
"driver/data_type_manager_impl_unittest.cc", |
- "driver/device_count_metrics_provider_unittest.cc", |
- "driver/device_info_data_type_controller_unittest.cc", |
- "driver/device_info_service_unittest.cc", |
- "driver/device_info_sync_service_unittest.cc", |
- "driver/device_info_util_unittest.cc", |
"driver/frontend_data_type_controller_unittest.cc", |
"driver/generic_change_processor_unittest.cc", |
"driver/glue/browser_thread_model_worker_unittest.cc", |
"driver/glue/sync_backend_host_impl_unittest.cc", |
"driver/glue/sync_backend_registrar_unittest.cc", |
"driver/glue/ui_model_worker_unittest.cc", |
- "driver/local_device_info_provider_unittest.cc", |
"driver/model_association_manager_unittest.cc", |
"driver/non_blocking_data_type_controller_unittest.cc", |
"driver/non_ui_data_type_controller_unittest.cc", |