[Sync] rename USS processor / worker interfaces

sync/engine/commit_queue_impl.cc

Index: sync/engine/commit_queue_impl.cc
diff --git a/sync/engine/model_type_sync_worker_impl.cc b/sync/engine/commit_queue_impl.cc
similarity index 92%
rename from sync/engine/model_type_sync_worker_impl.cc
rename to sync/engine/commit_queue_impl.cc
index 29f385a9866b9b313cd3c591f06bf0fae50433ba..5d0238bfe58629aa32a25443b2a72f6aed9fab9f 100644
--- a/sync/engine/model_type_sync_worker_impl.cc
+++ b/sync/engine/commit_queue_impl.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "sync/engine/model_type_sync_worker_impl.h"
+#include "sync/engine/commit_queue_impl.h"
 
 #include "base/bind.h"
 #include "base/format_macros.h"
@@ -11,7 +11,7 @@
 #include "base/strings/stringprintf.h"
 #include "sync/engine/commit_contribution.h"
 #include "sync/engine/entity_tracker.h"
-#include "sync/engine/model_type_sync_proxy.h"
+#include "sync/engine/model_type_processor.h"
 #include "sync/engine/non_blocking_type_commit_contribution.h"
 #include "sync/syncable/syncable_util.h"
 #include "sync/util/cryptographer.h"
@@ -25,13 +25,13 @@ using syncer::ModelType;
 using syncer::NudgeHandler;
 using syncer::SyncerError;
 
-ModelTypeSyncWorkerImpl::ModelTypeSyncWorkerImpl(
+CommitQueueImpl::CommitQueueImpl(
     ModelType type,
     const DataTypeState& initial_state,
     const UpdateResponseDataList& saved_pending_updates,
     scoped_ptr<Cryptographer> cryptographer,
     NudgeHandler* nudge_handler,
-    scoped_ptr<ModelTypeSyncProxy> type_sync_proxy)
+    scoped_ptr<ModelTypeProcessor> type_sync_proxy)
     : type_(type),
       data_type_state_(initial_state),
       type_sync_proxy_(type_sync_proxy.Pass()),
@@ -59,19 +59,19 @@ ModelTypeSyncWorkerImpl::ModelTypeSyncWorkerImpl(
   }
 }
 
-ModelTypeSyncWorkerImpl::~ModelTypeSyncWorkerImpl() {
+CommitQueueImpl::~CommitQueueImpl() {
 }
 
-ModelType ModelTypeSyncWorkerImpl::GetModelType() const {
+ModelType CommitQueueImpl::GetModelType() const {
   DCHECK(CalledOnValidThread());
   return type_;
 }
 
-bool ModelTypeSyncWorkerImpl::IsEncryptionRequired() const {
+bool CommitQueueImpl::IsEncryptionRequired() const {
   return !!cryptographer_;
 }
 
-void ModelTypeSyncWorkerImpl::UpdateCryptographer(
+void CommitQueueImpl::UpdateCryptographer(
     scoped_ptr<Cryptographer> cryptographer) {
   DCHECK(cryptographer);
   cryptographer_ = cryptographer.Pass();
@@ -85,19 +85,19 @@ void ModelTypeSyncWorkerImpl::UpdateCryptographer(
 }
 
 // UpdateHandler implementation.
-void ModelTypeSyncWorkerImpl::GetDownloadProgress(
+void CommitQueueImpl::GetDownloadProgress(
     sync_pb::DataTypeProgressMarker* progress_marker) const {
   DCHECK(CalledOnValidThread());
   progress_marker->CopyFrom(data_type_state_.progress_marker);
 }
 
-void ModelTypeSyncWorkerImpl::GetDataTypeContext(
+void CommitQueueImpl::GetDataTypeContext(
     sync_pb::DataTypeContext* context) const {
   DCHECK(CalledOnValidThread());
   context->CopyFrom(data_type_state_.type_context);
 }
 
-SyncerError ModelTypeSyncWorkerImpl::ProcessGetUpdatesResponse(
+SyncerError CommitQueueImpl::ProcessGetUpdatesResponse(
     const sync_pb::DataTypeProgressMarker& progress_marker,
     const sync_pb::DataTypeContext& mutated_context,
     const SyncEntityList& applicable_updates,
@@ -194,12 +194,12 @@ SyncerError ModelTypeSyncWorkerImpl::ProcessGetUpdatesResponse(
   return syncer::SYNCER_OK;
 }
 
-void ModelTypeSyncWorkerImpl::ApplyUpdates(
+void CommitQueueImpl::ApplyUpdates(
     syncer::sessions::StatusController* status) {
   DCHECK(CalledOnValidThread());
   // This function is called only when we've finished a download cycle, ie. we
   // got a response with changes_remaining == 0.  If this is our first download
-  // cycle, we should update our state so the ModelTypeSyncProxy knows that
+  // cycle, we should update our state so the ModelTypeProcessor knows that
   // it's safe to commit items now.
   if (!data_type_state_.initial_sync_done) {
     DVLOG(1) << "Delivering 'initial sync done' ping.";
@@ -211,14 +211,14 @@ void ModelTypeSyncWorkerImpl::ApplyUpdates(
   }
 }
 
-void ModelTypeSyncWorkerImpl::PassiveApplyUpdates(
+void CommitQueueImpl::PassiveApplyUpdates(
     syncer::sessions::StatusController* status) {
   NOTREACHED()
       << "Non-blocking types should never apply updates on sync thread.  "
       << "ModelType is: " << ModelTypeToString(type_);
 }
 
-void ModelTypeSyncWorkerImpl::EnqueueForCommit(
+void CommitQueueImpl::EnqueueForCommit(
     const CommitRequestDataList& list) {
   DCHECK(CalledOnValidThread());
 
@@ -236,7 +236,7 @@ void ModelTypeSyncWorkerImpl::EnqueueForCommit(
 }
 
 // CommitContributor implementation.
-scoped_ptr<CommitContribution> ModelTypeSyncWorkerImpl::GetContribution(
+scoped_ptr<CommitContribution> CommitQueueImpl::GetContribution(
     size_t max_entries) {
   DCHECK(CalledOnValidThread());
 
@@ -271,7 +271,7 @@ scoped_ptr<CommitContribution> ModelTypeSyncWorkerImpl::GetContribution(
       data_type_state_.type_context, commit_entities, sequence_numbers, this));
 }
 
-void ModelTypeSyncWorkerImpl::StorePendingCommit(
+void CommitQueueImpl::StorePendingCommit(
     const CommitRequestData& request) {
   if (!request.deleted) {
     DCHECK_EQ(type_, syncer::GetModelTypeFromSpecifics(request.specifics));
@@ -298,7 +298,7 @@ void ModelTypeSyncWorkerImpl::StorePendingCommit(
   }
 }
 
-void ModelTypeSyncWorkerImpl::OnCommitResponse(
+void CommitQueueImpl::OnCommitResponse(
     const CommitResponseDataList& response_list) {
   for (CommitResponseDataList::const_iterator response_it =
            response_list.begin();
@@ -326,16 +326,16 @@ void ModelTypeSyncWorkerImpl::OnCommitResponse(
   type_sync_proxy_->OnCommitCompleted(data_type_state_, response_list);
 }
 
-base::WeakPtr<ModelTypeSyncWorkerImpl> ModelTypeSyncWorkerImpl::AsWeakPtr() {
+base::WeakPtr<CommitQueueImpl> CommitQueueImpl::AsWeakPtr() {
   return weak_ptr_factory_.GetWeakPtr();
 }
 
-bool ModelTypeSyncWorkerImpl::IsTypeInitialized() const {
+bool CommitQueueImpl::IsTypeInitialized() const {
   return data_type_state_.initial_sync_done &&
          !data_type_state_.progress_marker.token().empty();
 }
 
-bool ModelTypeSyncWorkerImpl::CanCommitItems() const {
+bool CommitQueueImpl::CanCommitItems() const {
   // We can't commit anything until we know the type's parent node.
   // We'll get it in the first update response.
   if (!IsTypeInitialized())
@@ -350,7 +350,7 @@ bool ModelTypeSyncWorkerImpl::CanCommitItems() const {
   return true;
 }
 
-void ModelTypeSyncWorkerImpl::HelpInitializeCommitEntity(
+void CommitQueueImpl::HelpInitializeCommitEntity(
     sync_pb::SyncEntity* sync_entity) {
   DCHECK(CanCommitItems());
 
@@ -387,7 +387,7 @@ void ModelTypeSyncWorkerImpl::HelpInitializeCommitEntity(
   // Call sync_entity->set_parent_id_string(...) for hierarchical entities here.
 }
 
-void ModelTypeSyncWorkerImpl::OnCryptographerUpdated() {
+void CommitQueueImpl::OnCryptographerUpdated() {
   DCHECK(cryptographer_);
 
   bool new_encryption_key = false;
@@ -437,7 +437,7 @@ void ModelTypeSyncWorkerImpl::OnCryptographerUpdated() {
   }
 }
 
-bool ModelTypeSyncWorkerImpl::DecryptSpecifics(
+bool CommitQueueImpl::DecryptSpecifics(
     Cryptographer* cryptographer,
     const sync_pb::EntitySpecifics& in,
     sync_pb::EntitySpecifics* out) {