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

Unified Diff: sync/internal_api/sync_manager_impl.cc

Issue 1539843002: Convert Pass()→std::move() in sync/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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
Index: sync/internal_api/sync_manager_impl.cc
diff --git a/sync/internal_api/sync_manager_impl.cc b/sync/internal_api/sync_manager_impl.cc
index 95c30de15b1132b4ac8d112536951e80a7477259..26033b4038a10f6f09396041d73935f7ac832e2a 100644
--- a/sync/internal_api/sync_manager_impl.cc
+++ b/sync/internal_api/sync_manager_impl.cc
@@ -5,6 +5,7 @@
#include "sync/internal_api/sync_manager_impl.h"
#include <string>
+#include <utility>
#include "base/base64.h"
#include "base/bind.h"
@@ -259,8 +260,8 @@ void SyncManagerImpl::Init(InitArgs* args) {
scoped_ptr<syncable::DirectoryBackingStore> backing_store =
args->internal_components_factory->BuildDirectoryBackingStore(
- InternalComponentsFactory::STORAGE_ON_DISK,
- args->credentials.email, absolute_db_path).Pass();
+ InternalComponentsFactory::STORAGE_ON_DISK, args->credentials.email,
+ absolute_db_path);
DCHECK(backing_store.get());
share_.directory.reset(
@@ -324,19 +325,13 @@ void SyncManagerImpl::Init(InitArgs* args) {
std::vector<SyncEngineEventListener*> listeners;
listeners.push_back(&allstatus_);
listeners.push_back(this);
- session_context_ =
- args->internal_components_factory->BuildContext(
- connection_manager_.get(),
- directory(),
- args->extensions_activity,
- listeners,
- &debug_info_event_listener_,
- model_type_registry_.get(),
- args->invalidator_client_id)
- .Pass();
+ session_context_ = args->internal_components_factory->BuildContext(
+ connection_manager_.get(), directory(), args->extensions_activity,
+ listeners, &debug_info_event_listener_, model_type_registry_.get(),
+ args->invalidator_client_id);
session_context_->set_account_name(args->credentials.email);
scheduler_ = args->internal_components_factory->BuildScheduler(
- name_, session_context_.get(), args->cancelation_signal).Pass();
+ name_, session_context_.get(), args->cancelation_signal);
scheduler_->Start(SyncScheduler::CONFIGURATION_MODE, base::Time());
@@ -910,10 +905,8 @@ void SyncManagerImpl::OnIncomingInvalidation(
DCHECK(thread_checker_.CalledOnValidThread());
allstatus_.IncrementNotificationsReceived();
- scheduler_->ScheduleInvalidationNudge(
- type,
- invalidation.Pass(),
- FROM_HERE);
+ scheduler_->ScheduleInvalidationNudge(type, std::move(invalidation),
+ FROM_HERE);
}
void SyncManagerImpl::RefreshTypes(ModelTypeSet types) {

Powered by Google App Engine
This is Rietveld 408576698