[Sync] Merge NBDTC and subclasses into ModelTypeController.

components/sync/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/buildflag_header.gni")
 import("//build/config/features.gni")
 import("//components/sync/protocol/protocol_sources.gni")
 import("//testing/test.gni")
 
 static_library("sync") {
@@ skipping 136 matching lines @@
     "core/http_bridge_network_resources.h",
     "core/http_post_provider_factory.h",
     "core/http_post_provider_interface.h",
     "core/internal_components_factory.h",
     "core/internal_components_factory_impl.cc",
     "core/internal_components_factory_impl.h",
     "core/model_type_connector.cc",
     "core/model_type_connector.h",
     "core/model_type_processor.cc",
     "core/model_type_processor.h",
+    "core/model_type_processor_proxy.cc",
+    "core/model_type_processor_proxy.h",
     "core/model_type_store_backend.cc",
     "core/model_type_store_backend.h",
     "core/model_type_store_impl.cc",
     "core/model_type_store_impl.h",
     "core/network_resources.h",
     "core/non_blocking_sync_common.cc",
     "core/non_blocking_sync_common.h",
     "core/processor_entity_tracker.cc",
     "core/processor_entity_tracker.h",
     "core/read_node.cc",
@@ skipping 113 matching lines @@
     "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",
-    "driver/non_blocking_data_type_controller.cc",
-    "driver/non_blocking_data_type_controller.h",
+    "driver/model_type_controller.cc",
+    "driver/model_type_controller.h",
     "driver/non_ui_data_type_controller.cc",
     "driver/non_ui_data_type_controller.h",
-    "driver/non_ui_model_type_controller.cc",
-    "driver/non_ui_model_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",
     "driver/proxy_data_type_controller.h",
     "driver/shared_change_processor.cc",
     "driver/shared_change_processor.h",
     "driver/shared_change_processor_ref.cc",
     "driver/shared_change_processor_ref.h",
@@ skipping 20 matching lines @@
     "driver/sync_service_utils.h",
     "driver/sync_stopped_reporter.cc",
     "driver/sync_stopped_reporter.h",
     "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/ui_model_type_controller.cc",
-    "driver/ui_model_type_controller.h",
     "driver/user_selectable_sync_type.h",
     "engine/commit_queue.cc",
     "engine/commit_queue.h",
     "engine/cycle/commit_counters.cc",
     "engine/cycle/commit_counters.h",
     "engine/cycle/model_neutral_state.cc",
     "engine/cycle/model_neutral_state.h",
     "engine/cycle/status_counters.cc",
     "engine/cycle/status_counters.h",
     "engine/cycle/sync_cycle_snapshot.cc",
@@ skipping 499 matching lines @@
     "driver/about_sync_util_unittest.cc",
     "driver/backend_migrator_unittest.cc",
     "driver/data_type_manager_impl_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/model_association_manager_unittest.cc",
-    "driver/non_blocking_data_type_controller_unittest.cc",
+    "driver/model_type_controller_unittest.cc",
     "driver/non_ui_data_type_controller_unittest.cc",
-    "driver/non_ui_model_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",
-    "driver/ui_model_type_controller_unittest.cc",
     "engine/cycle/sync_cycle_snapshot_unittest.cc",
     "engine/model_safe_worker_unittest.cc",
     "engine_impl/apply_control_data_updates_unittest.cc",
     "engine_impl/backoff_delay_provider_unittest.cc",
     "engine_impl/cycle/nudge_tracker_unittest.cc",
     "engine_impl/cycle/status_controller_unittest.cc",
     "engine_impl/directory_commit_contribution_unittest.cc",
     "engine_impl/directory_update_handler_unittest.cc",
     "engine_impl/get_updates_processor_unittest.cc",
     "engine_impl/model_type_registry_unittest.cc",
@@ skipping 216 matching lines @@
     deps = [
       ":fake_server_jni",
       ":sync",
       ":test_support_sync_fake_server",
       "//base",
       "//testing/gtest",
       "//url:url",
     ]
   }
 }