Chromium Code Reviews| Index: sync/test/engine/injectable_sync_context_proxy.h |
| diff --git a/sync/test/engine/injectable_sync_context_proxy.h b/sync/test/engine/injectable_sync_context_proxy.h |
| index b0ff6f6985e9353605c06d99021d66985721683f..448332c06391a77a93ae31496c8918e425f1442b 100644 |
| --- a/sync/test/engine/injectable_sync_context_proxy.h |
| +++ b/sync/test/engine/injectable_sync_context_proxy.h |
| @@ -11,36 +11,36 @@ |
| namespace syncer_v2 { |
| -class ModelTypeSyncProxyImpl; |
| -class ModelTypeSyncWorker; |
| +class ModelTypeProcessorImpl; |
| +class CommitQueue; |
| // A SyncContextProxy implementation that, when a connection request is made, |
| -// initalizes a connection to a previously injected ModelTypeSyncProxyImpl. |
| +// initalizes a connection to a previously injected ModelTypeProcessorImpl. |
| class InjectableSyncContextProxy : public SyncContextProxy { |
| public: |
| - explicit InjectableSyncContextProxy(ModelTypeSyncWorker* worker); |
| + explicit InjectableSyncContextProxy(CommitQueue* worker); |
| ~InjectableSyncContextProxy() override; |
| void ConnectTypeToSync( |
| syncer::ModelType type, |
| const DataTypeState& data_type_state, |
| const UpdateResponseDataList& pending_updates, |
| - const base::WeakPtr<ModelTypeSyncProxyImpl>& type_sync_proxy) override; |
| + const base::WeakPtr<ModelTypeProcessorImpl>& type_sync_proxy) override; |
| void Disconnect(syncer::ModelType type) override; |
| scoped_ptr<SyncContextProxy> Clone() const override; |
| - ModelTypeSyncWorker* GetWorker(); |
| + CommitQueue* GetWorker(); |
|
stanisc
2015/08/31 17:42:19
Probably shouldn't be called GetWorker anymore
Gang Wu
2015/08/31 22:38:05
Done.
|
| private: |
| // A flag to ensure ConnectTypeToSync is called at most once. |
| bool is_worker_connected_; |
| - // The ModelTypeSyncProxy's contract expects that it gets to own this object, |
| + // The ModelTypeProcessor's contract expects that it gets to own this object, |
| // so we can retain only a non-owned pointer to it. |
| // |
| // This is very unsafe, but we can get away with it since these tests are not |
| // exercising the proxy <-> worker connection code. |
| - ModelTypeSyncWorker* worker_; |
| + CommitQueue* worker_; |
| }; |
| } // namespace syncer |