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

Unified Diff: chrome/browser/supervised_user/supervised_user_settings_service.cc

Issue 1551503002: Convert Pass()→std::move() in //chrome (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: chrome/browser/supervised_user/supervised_user_settings_service.cc
diff --git a/chrome/browser/supervised_user/supervised_user_settings_service.cc b/chrome/browser/supervised_user/supervised_user_settings_service.cc
index 166ac15eaead787df4e8d90b84365ad13915c759..db09106b4e5df4dd6792f75746f69d280395fa07 100644
--- a/chrome/browser/supervised_user/supervised_user_settings_service.cc
+++ b/chrome/browser/supervised_user/supervised_user_settings_service.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/supervised_user/supervised_user_settings_service.h"
#include <stddef.h>
+#include <utility>
#include "base/callback.h"
#include "base/json/json_reader.h"
@@ -189,8 +190,8 @@ SyncMergeResult SupervisedUserSettingsService::MergeDataAndStartSyncing(
scoped_ptr<SyncChangeProcessor> sync_processor,
scoped_ptr<SyncErrorFactory> error_handler) {
DCHECK_EQ(SUPERVISED_USER_SETTINGS, type);
- sync_processor_ = sync_processor.Pass();
- error_handler_ = error_handler.Pass();
+ sync_processor_ = std::move(sync_processor);
+ error_handler_ = std::move(error_handler);
// Clear all atomic and split settings, then recreate them from Sync data.
Clear();
@@ -406,7 +407,7 @@ scoped_ptr<base::DictionaryValue> SupervisedUserSettingsService::GetSettings() {
settings->Set(it.key(), it.value().DeepCopy());
}
- return settings.Pass();
+ return settings;
}
void SupervisedUserSettingsService::InformSubscribers() {

Powered by Google App Engine
This is Rietveld 408576698