sync: Mass rename of non-blocking sync classes

sync/sync_tests.gypi

Index: sync/sync_tests.gypi
diff --git a/sync/sync_tests.gypi b/sync/sync_tests.gypi
index 6212dd4707eb766306588739a13cbbeb23851dab..5ba457b297d2f5506049abd9a8d9080b08e2aeea 100644
--- a/sync/sync_tests.gypi
+++ b/sync/sync_tests.gypi
@@ -38,12 +38,14 @@
         'test/engine/fake_model_worker.h',
         'test/engine/fake_sync_scheduler.cc',
         'test/engine/fake_sync_scheduler.h',
+        'test/engine/injectable_sync_context_proxy.cc',
+        'test/engine/injectable_sync_context_proxy.h',
         'test/engine/mock_connection_manager.cc',
         'test/engine/mock_connection_manager.h',
-        'test/engine/mock_non_blocking_type_processor_core.cc',
-        'test/engine/mock_non_blocking_type_processor_core.h',
-        'test/engine/mock_non_blocking_type_processor.cc',
-        'test/engine/mock_non_blocking_type_processor.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_update_handler.cc',
         'test/engine/mock_update_handler.h',
         'test/engine/single_type_mock_server.cc',
@@ -53,8 +55,6 @@
         'test/engine/test_id_factory.h',
         'test/engine/test_syncable_utils.cc',
         'test/engine/test_syncable_utils.h',
-        'test/engine/injectable_sync_core_proxy.cc',
-        'test/engine/injectable_sync_core_proxy.h',
         'test/fake_encryptor.cc',
         'test/fake_encryptor.h',
         'test/fake_sync_encryption_handler.cc',
@@ -200,13 +200,13 @@
         'internal_api/public/base/invalidation_test_util.cc',
         'internal_api/public/base/invalidation_test_util.h',
         'internal_api/public/test/fake_sync_manager.h',
-        'internal_api/public/test/null_sync_core_proxy.h',
+        'internal_api/public/test/null_sync_context_proxy.h',
         'internal_api/public/test/sync_manager_factory_for_profile_sync_test.h',
         'internal_api/public/test/test_entry_factory.h',
         'internal_api/public/test/test_internal_components_factory.h',
         'internal_api/public/test/test_user_share.h',
         'internal_api/test/fake_sync_manager.cc',
-        'internal_api/test/null_sync_core_proxy.cc',
+        'internal_api/test/null_sync_context_proxy.cc',
         'internal_api/test/sync_manager_factory_for_profile_sync_test.cc',
         'internal_api/test/sync_manager_for_profile_sync_test.cc',
         'internal_api/test/sync_manager_for_profile_sync_test.h',
@@ -298,12 +298,12 @@
           'engine/backoff_delay_provider_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_thread_sync_entity_unittest.cc',
-          'engine/non_blocking_type_processor_core_unittest.cc',
-          'engine/non_blocking_type_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/sync_scheduler_unittest.cc',
-          'engine/sync_thread_sync_entity_unittest.cc',
           'engine/syncer_proto_util_unittest.cc',
           'engine/syncer_unittest.cc',
           'engine/syncer_util_unittest.cc',
@@ -435,7 +435,7 @@
           'internal_api/public/change_record_unittest.cc',
           'internal_api/public/sessions/sync_session_snapshot_unittest.cc',
           'internal_api/sync_backup_manager_unittest.cc',
-          'internal_api/sync_core_proxy_impl_unittest.cc',
+          'internal_api/sync_context_proxy_impl_unittest.cc',
           'internal_api/sync_encryption_handler_impl_unittest.cc',
           'internal_api/sync_manager_impl_unittest.cc',
           'internal_api/sync_rollback_manager_base_unittest.cc',