| 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..86ad6891b011521b4eb2a8ef1ebfa7522151e9e5 100644 | 
| --- a/sync/test/engine/injectable_sync_context_proxy.cc | 
| +++ b/sync/test/engine/injectable_sync_context_proxy.cc | 
| @@ -4,14 +4,14 @@ | 
|  | 
| #include "sync/test/engine/injectable_sync_context_proxy.h" | 
|  | 
| +#include "sync/engine/commit_queue.h" | 
| #include "sync/engine/model_type_sync_proxy_impl.h" | 
| -#include "sync/engine/model_type_sync_worker.h" | 
|  | 
| namespace syncer_v2 { | 
|  | 
| InjectableSyncContextProxy::InjectableSyncContextProxy( | 
| -    ModelTypeSyncWorker* worker) | 
| -    : is_worker_connected_(false), worker_(worker) { | 
| +    CommitQueue* queue) | 
| +    : is_worker_connected_(false), queue_(queue) { | 
| } | 
|  | 
| InjectableSyncContextProxy::~InjectableSyncContextProxy() { | 
| @@ -28,23 +28,23 @@ void InjectableSyncContextProxy::ConnectTypeToSync( | 
|  | 
| // 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> queue(queue_); | 
|  | 
| -  type_sync_proxy->OnConnect(worker.Pass()); | 
| +  type_sync_proxy->OnConnect(queue.Pass()); | 
| } | 
|  | 
| void InjectableSyncContextProxy::Disconnect(syncer::ModelType type) { | 
| -  // This should delete the worker, but we don't own it. | 
| -  worker_ = NULL; | 
| +  // This should delete the queue, but we don't own it. | 
| +  queue_ = NULL; | 
| } | 
|  | 
| scoped_ptr<SyncContextProxy> InjectableSyncContextProxy::Clone() const { | 
| // This confuses ownership.  We trust that our callers are well-behaved. | 
| -  return scoped_ptr<SyncContextProxy>(new InjectableSyncContextProxy(worker_)); | 
| +  return scoped_ptr<SyncContextProxy>(new InjectableSyncContextProxy(queue_)); | 
| } | 
|  | 
| -ModelTypeSyncWorker* InjectableSyncContextProxy::GetWorker() { | 
| -  return worker_; | 
| +CommitQueue* InjectableSyncContextProxy::GetQueue() { | 
| +  return queue_; | 
| } | 
|  | 
| }  // namespace syncer | 
|  |