| Index: sync/BUILD.gn | 
| diff --git a/sync/BUILD.gn b/sync/BUILD.gn | 
| index bfa75c4cb31c40c3e0027d9c63ae458bb5b73472..047dfab9e7762a60560e2b1fa1bfcac08d06aa3f 100644 | 
| --- a/sync/BUILD.gn | 
| +++ b/sync/BUILD.gn | 
| @@ -58,6 +58,10 @@ source_set("sync_core") { | 
| "engine/commit_contributor.h", | 
| "engine/commit_processor.cc", | 
| "engine/commit_processor.h", | 
| +    "engine/commit_queue.cc", | 
| +    "engine/commit_queue.h", | 
| +    "engine/commit_queue_impl.cc", | 
| +    "engine/commit_queue_impl.h", | 
| "engine/commit_util.cc", | 
| "engine/commit_util.h", | 
| "engine/conflict_resolver.cc", | 
| @@ -80,14 +84,10 @@ source_set("sync_core") { | 
| "engine/get_updates_processor.h", | 
| "engine/model_type_entity.cc", | 
| "engine/model_type_entity.h", | 
| -    "engine/model_type_sync_proxy.cc", | 
| -    "engine/model_type_sync_proxy.h", | 
| -    "engine/model_type_sync_proxy_impl.cc", | 
| -    "engine/model_type_sync_proxy_impl.h", | 
| -    "engine/model_type_sync_worker.cc", | 
| -    "engine/model_type_sync_worker.h", | 
| -    "engine/model_type_sync_worker_impl.cc", | 
| -    "engine/model_type_sync_worker_impl.h", | 
| +    "engine/model_type_processor.cc", | 
| +    "engine/model_type_processor.h", | 
| +    "engine/model_type_processor_impl.cc", | 
| +    "engine/model_type_processor_impl.h", | 
| "engine/net/server_connection_manager.cc", | 
| "engine/net/server_connection_manager.h", | 
| "engine/net/url_translator.cc", | 
| @@ -471,12 +471,12 @@ static_library("test_support_sync_core") { | 
| "test/engine/fake_sync_scheduler.h", | 
| "test/engine/injectable_sync_context_proxy.cc", | 
| "test/engine/injectable_sync_context_proxy.h", | 
| +    "test/engine/mock_commit_queue.cc", | 
| +    "test/engine/mock_commit_queue.h", | 
| "test/engine/mock_connection_manager.cc", | 
| "test/engine/mock_connection_manager.h", | 
| -    "test/engine/mock_model_type_sync_proxy.cc", | 
| -    "test/engine/mock_model_type_sync_proxy.h", | 
| -    "test/engine/mock_model_type_sync_worker.cc", | 
| -    "test/engine/mock_model_type_sync_worker.h", | 
| +    "test/engine/mock_model_type_processor.cc", | 
| +    "test/engine/mock_model_type_processor.h", | 
| "test/engine/mock_nudge_handler.cc", | 
| "test/engine/mock_nudge_handler.h", | 
| "test/engine/mock_update_handler.cc", | 
| @@ -601,13 +601,13 @@ test("sync_unit_tests") { | 
| "api/sync_merge_result_unittest.cc", | 
| "engine/apply_control_data_updates_unittest.cc", | 
| "engine/backoff_delay_provider_unittest.cc", | 
| +    "engine/commit_queue_impl_unittest.cc", | 
| "engine/directory_commit_contribution_unittest.cc", | 
| "engine/directory_update_handler_unittest.cc", | 
| "engine/entity_tracker_unittest.cc", | 
| "engine/get_updates_processor_unittest.cc", | 
| "engine/model_type_entity_unittest.cc", | 
| -    "engine/model_type_sync_proxy_impl_unittest.cc", | 
| -    "engine/model_type_sync_worker_impl_unittest.cc", | 
| +    "engine/model_type_processor_impl_unittest.cc", | 
| "engine/sync_scheduler_unittest.cc", | 
| "engine/syncer_proto_util_unittest.cc", | 
| "engine/syncer_unittest.cc", | 
|  |