diff options
Diffstat (limited to 'components/syncable_prefs/pref_model_associator.cc')
-rw-r--r-- | components/syncable_prefs/pref_model_associator.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/components/syncable_prefs/pref_model_associator.cc b/components/syncable_prefs/pref_model_associator.cc index a78c973..dc7251f 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_; |