| Index: sync/test/engine/injectable_sync_context_proxy.cc
|
| diff --git a/sync/test/engine/injectable_sync_context_proxy.cc b/sync/test/engine/injectable_sync_context_proxy.cc
|
| index 076fb05c81aeb856aa3a14a5321158084da6b8ce..44366305eba2d99ae343a10813ed5b80acc38df3 100644
|
| --- a/sync/test/engine/injectable_sync_context_proxy.cc
|
| +++ b/sync/test/engine/injectable_sync_context_proxy.cc
|
| @@ -4,13 +4,13 @@
|
|
|
| #include "sync/test/engine/injectable_sync_context_proxy.h"
|
|
|
| -#include "sync/engine/model_type_sync_proxy_impl.h"
|
| -#include "sync/engine/model_type_sync_worker.h"
|
| +#include "sync/engine/commit_queue.h"
|
| +#include "sync/engine/model_type_processor_impl.h"
|
|
|
| namespace syncer_v2 {
|
|
|
| InjectableSyncContextProxy::InjectableSyncContextProxy(
|
| - ModelTypeSyncWorker* worker)
|
| + CommitQueue* worker)
|
| : is_worker_connected_(false), worker_(worker) {
|
| }
|
|
|
| @@ -21,14 +21,14 @@ void InjectableSyncContextProxy::ConnectTypeToSync(
|
| syncer::ModelType type,
|
| const DataTypeState& data_type_state,
|
| const UpdateResponseDataList& response_list,
|
| - const base::WeakPtr<ModelTypeSyncProxyImpl>& type_sync_proxy) {
|
| + const base::WeakPtr<ModelTypeProcessorImpl>& type_sync_proxy) {
|
| // This class is allowed to participate in only one connection.
|
| DCHECK(!is_worker_connected_);
|
| is_worker_connected_ = true;
|
|
|
| // Hands off ownership of our member to the type_sync_proxy, while keeping
|
| // an unsafe pointer to it. This is why we can only connect once.
|
| - scoped_ptr<ModelTypeSyncWorker> worker(worker_);
|
| + scoped_ptr<CommitQueue> worker(worker_);
|
|
|
| type_sync_proxy->OnConnect(worker.Pass());
|
| }
|
| @@ -43,7 +43,7 @@ scoped_ptr<SyncContextProxy> InjectableSyncContextProxy::Clone() const {
|
| return scoped_ptr<SyncContextProxy>(new InjectableSyncContextProxy(worker_));
|
| }
|
|
|
| -ModelTypeSyncWorker* InjectableSyncContextProxy::GetWorker() {
|
| +CommitQueue* InjectableSyncContextProxy::GetWorker() {
|
| return worker_;
|
| }
|
|
|
|
|