chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service.cc - Issue 1551503002: Convert Pass()→std::move() in //chrome

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/supervised_user/legacy/supervised_user_shared_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

« chrome/browser/sessions/tab_restore_service_factory.cc ('K') | « chrome/browser/supervised_user/legacy/supervised_user_registration_utility_unittest.cc ('k') | chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service.cc

diff --git a/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service.cc b/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service.cc

index 9ce935e5972e9b3674289ac2e1dcc919cf6d3d21..60ec741691a6160e6fb02412b393bfb035aeac18 100644

--- a/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service.cc

+++ b/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service.cc

@@ -6,6 +6,7 @@

#include <map>

#include <set>

+#include <utility>

#include "base/json/json_reader.h"

#include "base/json/json_writer.h"

@@ -194,8 +195,8 @@ SupervisedUserSharedSettingsService::MergeDataAndStartSyncing(

scoped_ptr<syncer::SyncChangeProcessor> sync_processor,

scoped_ptr<syncer::SyncErrorFactory> error_handler) {

DCHECK_EQ(SUPERVISED_USER_SHARED_SETTINGS, type);

- sync_processor_ = sync_processor.Pass();

- error_handler_ = error_handler.Pass();

+ sync_processor_ = std::move(sync_processor);

+ error_handler_ = std::move(error_handler);

// We keep a map from MU ID to the set of keys that we have seen in the

// initial sync data.