chrome/browser/sync/profile_sync_service_factory.cc - Issue 1882243004: Convert //chrome/browser/sync 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/sync/profile_sync_service_factory.cc

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

Patch Set: Address feedback 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

« no previous file with comments | « chrome/browser/sync/profile_sync_service_android.cc ('k') | chrome/browser/sync/profile_sync_service_factory_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/profile_sync_service_factory.cc

diff --git a/chrome/browser/sync/profile_sync_service_factory.cc b/chrome/browser/sync/profile_sync_service_factory.cc

index 133869ce440e00ae5859fb4de5cf7b3cfb5bc4b0..b4abcdf7a5f4f65d95d3fd232c15057cd4ab9d28 100644

--- a/chrome/browser/sync/profile_sync_service_factory.cc

+++ b/chrome/browser/sync/profile_sync_service_factory.cc

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

#include <utility>

+#include "base/memory/ptr_util.h"

#include "base/memory/singleton.h"

#include "base/time/time.h"

#include "build/build_config.h"

@@ -153,7 +154,7 @@ KeyedService* ProfileSyncServiceFactory::BuildServiceInstanceFor(

AboutSigninInternalsFactory::GetForProfile(profile);

init_params.signin_wrapper =

- make_scoped_ptr(new SupervisedUserSigninManagerWrapper(profile, signin));

+ base::WrapUnique(new SupervisedUserSigninManagerWrapper(profile, signin));

init_params.oauth2_token_service =

ProfileOAuth2TokenServiceFactory::GetForProfile(profile);

init_params.gaia_cookie_manager_service =

@@ -170,7 +171,7 @@ KeyedService* ProfileSyncServiceFactory::BuildServiceInstanceFor(

: ProfileSyncService::MANUAL_START;

init_params.sync_client =

- make_scoped_ptr(new browser_sync::ChromeSyncClient(profile));

+ base::WrapUnique(new browser_sync::ChromeSyncClient(profile));

init_params.network_time_update_callback = base::Bind(&UpdateNetworkTime);

init_params.base_directory = profile->GetPath();

@@ -185,7 +186,7 @@ KeyedService* ProfileSyncServiceFactory::BuildServiceInstanceFor(

content::BrowserThread::FILE);

init_params.blocking_pool = content::BrowserThread::GetBlockingPool();

- auto pss = make_scoped_ptr(new ProfileSyncService(std::move(init_params)));

+ auto pss = base::WrapUnique(new ProfileSyncService(std::move(init_params)));

// Will also initialize the sync client.

pss->Initialize();