Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(32)

Unified Diff: sync/test/engine/injectable_sync_context_proxy.cc

Issue 1325453003: [Sync] rename USS processor / worker interfaces (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update base on comments Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sync/test/engine/injectable_sync_context_proxy.h ('k') | sync/test/engine/mock_commit_queue.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « sync/test/engine/injectable_sync_context_proxy.h ('k') | sync/test/engine/mock_commit_queue.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698