Index: sync/sessions/model_type_registry.cc |
diff --git a/sync/sessions/model_type_registry.cc b/sync/sessions/model_type_registry.cc |
index 03a0736b0be6744afe596b09c82d5d0780e17b6b..5806522470a0d7ca2d0fb7d7dbd099a388e22fd6 100644 |
--- a/sync/sessions/model_type_registry.cc |
+++ b/sync/sessions/model_type_registry.cc |
@@ -5,6 +5,7 @@ |
#include "sync/sessions/model_type_registry.h" |
#include <stddef.h> |
+#include <utility> |
#include "base/bind.h" |
#include "base/observer_list.h" |
@@ -147,15 +148,15 @@ void ModelTypeRegistry::ConnectSyncTypeToWorker( |
scoped_ptr<syncer_v2::ModelTypeWorker> worker(new syncer_v2::ModelTypeWorker( |
type, activation_context->data_type_state, |
- activation_context->saved_pending_updates, cryptographer_copy.Pass(), |
- nudge_handler_, activation_context->type_processor.Pass())); |
+ activation_context->saved_pending_updates, std::move(cryptographer_copy), |
+ nudge_handler_, std::move(activation_context->type_processor))); |
// Initialize Processor -> Worker communication channel. |
scoped_ptr<syncer_v2::CommitQueue> commit_queue_proxy(new CommitQueueProxy( |
worker->AsWeakPtr(), scoped_refptr<base::SequencedTaskRunner>( |
base::ThreadTaskRunnerHandle::Get()))); |
- type_processor->OnConnect(commit_queue_proxy.Pass()); |
+ type_processor->OnConnect(std::move(commit_queue_proxy)); |
DCHECK(update_handler_map_.find(type) == update_handler_map_.end()); |
DCHECK(commit_contributor_map_.find(type) == commit_contributor_map_.end()); |
@@ -164,7 +165,7 @@ void ModelTypeRegistry::ConnectSyncTypeToWorker( |
commit_contributor_map_.insert(std::make_pair(type, worker.get())); |
// The container takes ownership. |
- model_type_workers_.push_back(worker.Pass()); |
+ model_type_workers_.push_back(std::move(worker)); |
DCHECK(Intersection(GetEnabledDirectoryTypes(), |
GetEnabledNonBlockingTypes()).Empty()); |