[Sync] rename USS processor / worker interfaces

sync/sessions/model_type_registry_unittest.cc

Index: sync/sessions/model_type_registry_unittest.cc
diff --git a/sync/sessions/model_type_registry_unittest.cc b/sync/sessions/model_type_registry_unittest.cc
index a831e035b623f28a52bd89779c9fda161411c4ff..5fceb673f96209955207764d5b5e91425bfd1822 100644
--- a/sync/sessions/model_type_registry_unittest.cc
+++ b/sync/sessions/model_type_registry_unittest.cc
@@ -7,7 +7,7 @@
 #include "base/deferred_sequenced_task_runner.h"
 #include "base/message_loop/message_loop.h"
 #include "base/thread_task_runner_handle.h"
-#include "sync/engine/model_type_sync_proxy_impl.h"
+#include "sync/engine/model_type_processor_impl.h"
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/sessions/model_type_registry.h"
 #include "sync/test/engine/fake_model_worker.h"
@@ -17,7 +17,7 @@
 
 namespace syncer {
 
-using syncer_v2::ModelTypeSyncProxyImpl;
+using syncer_v2::ModelTypeProcessorImpl;
 
 class ModelTypeRegistryTest : public ::testing::Test {
  public:
@@ -145,8 +145,8 @@ TEST_F(ModelTypeRegistryTest, SetEnabledDirectoryTypes_OffAndOn) {
 }
 
 TEST_F(ModelTypeRegistryTest, NonBlockingTypes) {
-  ModelTypeSyncProxyImpl themes_sync_proxy(syncer::THEMES);
-  ModelTypeSyncProxyImpl sessions_sync_proxy(syncer::SESSIONS);
+  ModelTypeProcessorImpl themes_sync_proxy(syncer::THEMES);
+  ModelTypeProcessorImpl sessions_sync_proxy(syncer::SESSIONS);
   scoped_refptr<base::DeferredSequencedTaskRunner> task_runner =
       new base::DeferredSequencedTaskRunner(
           base::ThreadTaskRunnerHandle::Get());
@@ -172,12 +172,12 @@ TEST_F(ModelTypeRegistryTest, NonBlockingTypes) {
       ModelTypeSet(syncer::SESSIONS)));
 
   // Allow ModelTypeRegistry destruction to delete the
-  // Sessions' ModelTypeSyncWorker.
+  // Sessions' CommitQueue.
 }
 
 TEST_F(ModelTypeRegistryTest, NonBlockingTypesWithDirectoryTypes) {
-  ModelTypeSyncProxyImpl themes_sync_proxy(syncer::THEMES);
-  ModelTypeSyncProxyImpl sessions_sync_proxy(syncer::SESSIONS);
+  ModelTypeProcessorImpl themes_sync_proxy(syncer::THEMES);
+  ModelTypeProcessorImpl sessions_sync_proxy(syncer::SESSIONS);
   scoped_refptr<base::DeferredSequencedTaskRunner> task_runner =
       new base::DeferredSequencedTaskRunner(
           base::ThreadTaskRunnerHandle::Get());
@@ -224,10 +224,10 @@ TEST_F(ModelTypeRegistryTest, NonBlockingTypesWithDirectoryTypes) {
 }
 
 TEST_F(ModelTypeRegistryTest, DeletionOrdering) {
-  scoped_ptr<ModelTypeSyncProxyImpl> themes_sync_proxy(
-      new ModelTypeSyncProxyImpl(syncer::THEMES));
-  scoped_ptr<ModelTypeSyncProxyImpl> sessions_sync_proxy(
-      new ModelTypeSyncProxyImpl(syncer::SESSIONS));
+  scoped_ptr<ModelTypeProcessorImpl> themes_sync_proxy(
+      new ModelTypeProcessorImpl(syncer::THEMES));
+  scoped_ptr<ModelTypeProcessorImpl> sessions_sync_proxy(
+      new ModelTypeProcessorImpl(syncer::SESSIONS));
   scoped_refptr<base::DeferredSequencedTaskRunner> task_runner =
       new base::DeferredSequencedTaskRunner(
           base::ThreadTaskRunnerHandle::Get());