Index: components/sync/BUILD.gn |
diff --git a/components/sync/BUILD.gn b/components/sync/BUILD.gn |
index 850ec8f7d642ecbe85da0700ce56c53fdabbbd90..b2e5f60e0fa4bc71e8d5a401e11ceac9dc7d4bff 100644 |
--- a/components/sync/BUILD.gn |
+++ b/components/sync/BUILD.gn |
@@ -82,6 +82,10 @@ static_library("sync") { |
"base/get_session_name_win.cc", |
"base/get_session_name_win.h", |
"base/immutable.h", |
+ "base/invalidation_adapter.cc", |
+ "base/invalidation_adapter.h", |
+ "base/invalidation_helper.cc", |
+ "base/invalidation_helper.h", |
"base/invalidation_interface.cc", |
"base/invalidation_interface.h", |
"base/logging.cc", |
@@ -94,13 +98,21 @@ static_library("sync") { |
"base/ordinal.h", |
"base/passphrase_type.cc", |
"base/passphrase_type.h", |
+ "base/pref_names.cc", |
+ "base/pref_names.h", |
"base/progress_marker_map.cc", |
"base/progress_marker_map.h", |
"base/proto_value_ptr.h", |
+ "base/report_unrecoverable_error.cc", |
+ "base/report_unrecoverable_error.h", |
"base/stop_source.h", |
"base/sync_db_util.h", |
+ "base/sync_prefs.cc", |
+ "base/sync_prefs.h", |
"base/syncer_error.cc", |
"base/syncer_error.h", |
+ "base/system_encryptor.cc", |
+ "base/system_encryptor.h", |
"base/time.cc", |
"base/time.h", |
"base/unique_position.cc", |
@@ -270,8 +282,6 @@ static_library("sync") { |
"driver/generic_change_processor_factory.h", |
"driver/glue/browser_thread_model_worker.cc", |
"driver/glue/browser_thread_model_worker.h", |
- "driver/glue/chrome_report_unrecoverable_error.cc", |
- "driver/glue/chrome_report_unrecoverable_error.h", |
"driver/glue/sync_backend_host.cc", |
"driver/glue/sync_backend_host.h", |
"driver/glue/sync_backend_host_core.cc", |
@@ -282,10 +292,6 @@ static_library("sync") { |
"driver/glue/sync_backend_registrar.h", |
"driver/glue/ui_model_worker.cc", |
"driver/glue/ui_model_worker.h", |
- "driver/invalidation_adapter.cc", |
- "driver/invalidation_adapter.h", |
- "driver/invalidation_helper.cc", |
- "driver/invalidation_helper.h", |
"driver/model_association_manager.cc", |
"driver/model_association_manager.h", |
"driver/model_associator.h", |
@@ -293,8 +299,6 @@ static_library("sync") { |
"driver/model_type_controller.h", |
"driver/non_ui_data_type_controller.cc", |
"driver/non_ui_data_type_controller.h", |
- "driver/pref_names.cc", |
- "driver/pref_names.h", |
"driver/protocol_event_observer.cc", |
"driver/protocol_event_observer.h", |
"driver/proxy_data_type_controller.cc", |
@@ -316,8 +320,6 @@ static_library("sync") { |
"driver/sync_error_controller.h", |
"driver/sync_frontend.cc", |
"driver/sync_frontend.h", |
- "driver/sync_prefs.cc", |
- "driver/sync_prefs.h", |
"driver/sync_service.cc", |
"driver/sync_service.h", |
"driver/sync_service_observer.cc", |
@@ -329,8 +331,6 @@ static_library("sync") { |
"driver/sync_type_preference_provider.h", |
"driver/sync_util.cc", |
"driver/sync_util.h", |
- "driver/system_encryptor.cc", |
- "driver/system_encryptor.h", |
"driver/ui_data_type_controller.cc", |
"driver/ui_data_type_controller.h", |
"driver/user_selectable_sync_type.h", |
@@ -806,6 +806,8 @@ source_set("unit_tests") { |
"base/ordinal_unittest.cc", |
"base/proto_value_ptr_unittest.cc", |
"base/protobuf_unittest.cc", |
+ "base/sync_prefs_unittest.cc", |
+ "base/system_encryptor_unittest.cc", |
"base/unique_position_unittest.cc", |
"base/weak_handle_unittest.cc", |
"core/change_record_unittest.cc", |
@@ -856,10 +858,8 @@ source_set("unit_tests") { |
"driver/non_ui_data_type_controller_unittest.cc", |
"driver/shared_change_processor_unittest.cc", |
"driver/startup_controller_unittest.cc", |
- "driver/sync_prefs_unittest.cc", |
"driver/sync_stopped_reporter_unittest.cc", |
"driver/sync_util_unittest.cc", |
- "driver/system_encryptor_unittest.cc", |
"driver/ui_data_type_controller_unittest.cc", |
"engine/cycle/sync_cycle_snapshot_unittest.cc", |
"engine/model_safe_worker_unittest.cc", |