chrome/browser/supervised_user/supervised_user_whitelist_service.h - Issue 1878143002: Convert //chrome/browser/supervised_user from scoped_ptr to std::unique_ptr

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/supervised_user_whitelist_service.h

Issue 1878143002: Convert //chrome/browser/supervised_user from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 8 months 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/supervised_user/child_accounts/permission_request_creator_apiary_unittest.cc ('K') | « chrome/browser/supervised_user/supervised_user_url_filter_unittest.cc ('k') | chrome/browser/supervised_user/supervised_user_whitelist_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/supervised_user/supervised_user_whitelist_service.h

diff --git a/chrome/browser/supervised_user/supervised_user_whitelist_service.h b/chrome/browser/supervised_user/supervised_user_whitelist_service.h

index d77f0d7fee11fdff18ab2185f8e82f728140659f..542e8be51f9f0c7f459b761883fe1ff2c9c66784 100644

--- a/chrome/browser/supervised_user/supervised_user_whitelist_service.h

+++ b/chrome/browser/supervised_user/supervised_user_whitelist_service.h

@@ -6,11 +6,11 @@

#define CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_WHITELIST_SERVICE_H_

#include <map>

+#include <memory>

#include <set>

#include <string>

#include "base/macros.h"

-#include "base/memory/scoped_ptr.h"

#include "base/memory/weak_ptr.h"

#include "base/strings/string16.h"

#include "base/time/time.h"

@@ -80,8 +80,8 @@ class SupervisedUserWhitelistService : public syncer::SyncableService {

syncer::SyncMergeResult MergeDataAndStartSyncing(

syncer::ModelType type,

const syncer::SyncDataList& initial_sync_data,

- scoped_ptr<syncer::SyncChangeProcessor> sync_processor,

- scoped_ptr<syncer::SyncErrorFactory> error_handler) override;

+ std::unique_ptr<syncer::SyncChangeProcessor> sync_processor,

+ std::unique_ptr<syncer::SyncErrorFactory> error_handler) override;

void StopSyncing(syncer::ModelType type) override;

syncer::SyncDataList GetAllSyncData(syncer::ModelType type) const override;

syncer::SyncError ProcessSyncChanges(