[Sync] Merge NBDTC and subclasses into ModelTypeController.

components/sync/BUILD.gn

Index: components/sync/BUILD.gn
diff --git a/components/sync/BUILD.gn b/components/sync/BUILD.gn
index 75b9c994d6c32abfd79d7c46b044ec134f7a699c..850ec8f7d642ecbe85da0700ce56c53fdabbbd90 100644
--- a/components/sync/BUILD.gn
+++ b/components/sync/BUILD.gn
@@ -154,6 +154,8 @@ static_library("sync") {
     "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",
@@ -287,12 +289,10 @@ static_library("sync") {
     "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",
@@ -333,8 +333,6 @@ static_library("sync") {
     "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",
@@ -854,9 +852,8 @@ source_set("unit_tests") {
     "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",
@@ -864,7 +861,6 @@ source_set("unit_tests") {
     "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",