ios/chrome/browser/sync/ios_chrome_profile_sync_test_util.cc - Issue 2256193002: Re-write many calls to WrapUnique() with MakeUnique()

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: ios/chrome/browser/sync/ios_chrome_profile_sync_test_util.cc

Issue 2256193002: Re-write many calls to WrapUnique() with MakeUnique() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 4 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 | « ios/chrome/browser/sync/ios_chrome_profile_sync_service_factory.cc ('k') | ios/chrome/browser/sync/ios_chrome_sync_client.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ios/chrome/browser/sync/ios_chrome_profile_sync_test_util.cc

diff --git a/ios/chrome/browser/sync/ios_chrome_profile_sync_test_util.cc b/ios/chrome/browser/sync/ios_chrome_profile_sync_test_util.cc

index 3464c69d46043de28f031cddb7198cb44f56911b..8f644d4b8ea9e771104112510b5e233e4366951a 100644

--- a/ios/chrome/browser/sync/ios_chrome_profile_sync_test_util.cc

+++ b/ios/chrome/browser/sync/ios_chrome_profile_sync_test_util.cc

@@ -23,14 +23,14 @@ ProfileSyncService::InitParams CreateProfileSyncServiceParamsForTest(

ios::ChromeBrowserState* browser_state) {

ProfileSyncService::InitParams init_params;

- init_params.signin_wrapper = base::WrapUnique(new SigninManagerWrapper(

- ios::SigninManagerFactory::GetForBrowserState(browser_state)));

+ init_params.signin_wrapper = base::MakeUnique<SigninManagerWrapper>(

+ ios::SigninManagerFactory::GetForBrowserState(browser_state));

init_params.oauth2_token_service =

OAuth2TokenServiceFactory::GetForBrowserState(browser_state);

init_params.start_behavior = ProfileSyncService::MANUAL_START;

init_params.sync_client =

sync_client ? std::move(sync_client)

- : base::WrapUnique(new IOSChromeSyncClient(browser_state));

+ : base::MakeUnique<IOSChromeSyncClient>(browser_state);

init_params.network_time_update_callback =

base::Bind(&browser_sync::EmptyNetworkTimeUpdate);

init_params.base_directory = browser_state->GetStatePath();

@@ -48,7 +48,7 @@ ProfileSyncService::InitParams CreateProfileSyncServiceParamsForTest(

std::unique_ptr<KeyedService> BuildMockProfileSyncService(

web::BrowserState* context) {

- return base::WrapUnique(

- new ProfileSyncServiceMock(CreateProfileSyncServiceParamsForTest(

- nullptr, ios::ChromeBrowserState::FromBrowserState(context))));

+ return base::MakeUnique<ProfileSyncServiceMock>(

+ CreateProfileSyncServiceParamsForTest(

+ nullptr, ios::ChromeBrowserState::FromBrowserState(context)));

}