| Index: sync/engine/model_type_sync_proxy_impl.h
|
| diff --git a/sync/engine/model_type_sync_proxy_impl.h b/sync/engine/model_type_sync_proxy_impl.h
|
| index 4346e2c76e6ac0b566e6ed01fecd0d4731f9036c..110297cdd0540a73b9c7e3d59c690e2093e48f09 100644
|
| --- a/sync/engine/model_type_sync_proxy_impl.h
|
| +++ b/sync/engine/model_type_sync_proxy_impl.h
|
| @@ -15,12 +15,13 @@
|
| #include "sync/protocol/sync.pb.h"
|
|
|
| namespace syncer_v2 {
|
| -class SyncContextProxy;
|
| +class CommitQueue;
|
| class ModelTypeEntity;
|
| -class ModelTypeSyncWorker;
|
| +class SyncContextProxy;
|
|
|
| // A sync component embedded on the synced type's thread that helps to handle
|
| // communication between sync and model type threads.
|
| +// TODO(gangwu): 526617 Derive this class from ModelTypeProcessor
|
| class SYNC_EXPORT_PRIVATE ModelTypeSyncProxyImpl : base::NonThreadSafe {
|
| public:
|
| ModelTypeSyncProxyImpl(syncer::ModelType type);
|
| @@ -56,7 +57,7 @@ class SYNC_EXPORT_PRIVATE ModelTypeSyncProxyImpl : base::NonThreadSafe {
|
| void Disconnect();
|
|
|
| // Callback used to process the handshake response.
|
| - void OnConnect(scoped_ptr<ModelTypeSyncWorker> worker);
|
| + void OnConnect(scoped_ptr<CommitQueue> worker);
|
|
|
| // Requests that an item be stored in sync.
|
| void Put(const std::string& client_tag,
|
| @@ -98,7 +99,7 @@ class SYNC_EXPORT_PRIVATE ModelTypeSyncProxyImpl : base::NonThreadSafe {
|
| void FlushPendingCommitRequests();
|
|
|
| // Clears any state related to outstanding communications with the
|
| - // ModelTypeSyncWorker. Used when we want to disconnect from
|
| + // CommitQueue. Used when we want to disconnect from
|
| // the current worker.
|
| void ClearTransientSyncState();
|
|
|
| @@ -124,12 +125,12 @@ class SYNC_EXPORT_PRIVATE ModelTypeSyncProxyImpl : base::NonThreadSafe {
|
| // connected to sync.
|
| scoped_ptr<SyncContextProxy> sync_context_proxy_;
|
|
|
| - // Reference to the ModelTypeSyncWorker.
|
| + // Reference to the CommitQueue.
|
| //
|
| // The interface hides the posting of tasks across threads as well as the
|
| - // ModelTypeSyncWorker's implementation. Both of these features are
|
| + // CommitQueue's implementation. Both of these features are
|
| // useful in tests.
|
| - scoped_ptr<ModelTypeSyncWorker> worker_;
|
| + scoped_ptr<CommitQueue> worker_;
|
|
|
| // The set of sync entities known to this object.
|
| EntityMap entities_;
|
|
|