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

Unified Diff: components/syncable_prefs/pref_model_associator.cc

Issue 1548203002: Convert Pass()→std::move() in //components/[n-z]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix bad headers 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: components/syncable_prefs/pref_model_associator.cc
diff --git a/components/syncable_prefs/pref_model_associator.cc b/components/syncable_prefs/pref_model_associator.cc
index a78c9734bb5076717c489136dd0753b2365ed29b..dc7251f85bed64d95c62da2bf0e7de1b9e101335 100644
--- a/components/syncable_prefs/pref_model_associator.cc
+++ b/components/syncable_prefs/pref_model_associator.cc
@@ -4,6 +4,8 @@
#include "components/syncable_prefs/pref_model_associator.h"
+#include <utility>
+
#include "base/auto_reset.h"
#include "base/json/json_reader.h"
#include "base/json/json_string_value_serializer.h"
@@ -165,8 +167,8 @@ syncer::SyncMergeResult PrefModelAssociator::MergeDataAndStartSyncing(
DCHECK(sync_processor.get());
DCHECK(sync_error_factory.get());
syncer::SyncMergeResult merge_result(type);
- sync_processor_ = sync_processor.Pass();
- sync_error_factory_ = sync_error_factory.Pass();
+ sync_processor_ = std::move(sync_processor);
+ sync_error_factory_ = std::move(sync_error_factory);
syncer::SyncChangeList new_changes;
std::set<std::string> remaining_preferences = registered_preferences_;
« no previous file with comments | « components/sync_sessions/sessions_sync_manager.cc ('k') | components/syncable_prefs/pref_service_syncable_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698