sync: Mass rename of non-blocking sync classes

sync/sync_core.gypi

Index: sync/sync_core.gypi
diff --git a/sync/sync_core.gypi b/sync/sync_core.gypi
index 8772d43db5e097291d5262b8ddd5a430100c9bf2..52052085a093a48de37dc81459adfb81eb796132 100644
--- a/sync/sync_core.gypi
+++ b/sync/sync_core.gypi
@@ -35,11 +35,11 @@
     'engine/backoff_delay_provider.cc',
     'engine/backoff_delay_provider.h',
     'engine/commit.cc',
-    'engine/commit.h',
     'engine/commit_contribution.cc',
     'engine/commit_contribution.h',
     'engine/commit_contributor.cc',
     'engine/commit_contributor.h',
+    'engine/commit.h',
     'engine/commit_processor.cc',
     'engine/commit_processor.h',
     'engine/commit_util.cc',
@@ -54,14 +54,24 @@
     'engine/directory_commit_contributor.h',
     'engine/directory_update_handler.cc',
     'engine/directory_update_handler.h',
+    'engine/entity_tracker.cc',
+    'engine/entity_tracker.h',
     'engine/get_commit_ids.cc',
     'engine/get_commit_ids.h',
     'engine/get_updates_delegate.cc',
     'engine/get_updates_delegate.h',
     'engine/get_updates_processor.cc',
     'engine/get_updates_processor.h',
-    'engine/model_thread_sync_entity.cc',
-    'engine/model_thread_sync_entity.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/net/server_connection_manager.cc',
     'engine/net/server_connection_manager.h',
     'engine/net/url_translator.cc',
@@ -70,14 +80,6 @@
     'engine/non_blocking_sync_common.h',
     'engine/non_blocking_type_commit_contribution.cc',
     'engine/non_blocking_type_commit_contribution.h',
-    'engine/non_blocking_type_processor.cc',
-    'engine/non_blocking_type_processor.h',
-    'engine/non_blocking_type_processor_core.cc',
-    'engine/non_blocking_type_processor_core.h',
-    'engine/non_blocking_type_processor_core_interface.cc',
-    'engine/non_blocking_type_processor_core_interface.h',
-    'engine/non_blocking_type_processor_interface.cc',
-    'engine/non_blocking_type_processor_interface.h',
     'engine/nudge_source.cc',
     'engine/nudge_source.h',
     'engine/process_updates_util.cc',
@@ -86,12 +88,6 @@
     'engine/sync_cycle_event.h',
     'engine/sync_engine_event_listener.cc',
     'engine/sync_engine_event_listener.h',
-    'engine/sync_scheduler.cc',
-    'engine/sync_scheduler.h',
-    'engine/sync_scheduler_impl.cc',
-    'engine/sync_scheduler_impl.h',
-    'engine/sync_thread_sync_entity.cc',
-    'engine/sync_thread_sync_entity.h',
     'engine/syncer.cc',
     'engine/syncer.h',
     'engine/syncer_proto_util.cc',
@@ -99,6 +95,10 @@
     'engine/syncer_types.h',
     'engine/syncer_util.cc',
     'engine/syncer_util.h',
+    'engine/sync_scheduler.cc',
+    'engine/sync_scheduler.h',
+    'engine/sync_scheduler_impl.cc',
+    'engine/sync_scheduler_impl.h',
     'engine/traffic_logger.cc',
     'engine/traffic_logger.h',
     'engine/update_applicator.cc',