ios/chrome/browser/signin/account_reconcilor_factory.cc - Issue 1861593005: Convert //ios 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: ios/chrome/browser/signin/account_reconcilor_factory.cc

Issue 1861593005: Convert //ios from scoped_ptr to std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase? 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:

Index: ios/chrome/browser/signin/account_reconcilor_factory.cc

diff --git a/ios/chrome/browser/signin/account_reconcilor_factory.cc b/ios/chrome/browser/signin/account_reconcilor_factory.cc

index cefb1474725876c4e1de1e73b74ac9f2513b9a45..a4b81e3438fbbfac731db97aea94e07a9b202590 100644

--- a/ios/chrome/browser/signin/account_reconcilor_factory.cc

+++ b/ios/chrome/browser/signin/account_reconcilor_factory.cc

@@ -41,11 +41,11 @@ AccountReconcilorFactory* AccountReconcilorFactory::GetInstance() {

return base::Singleton<AccountReconcilorFactory>::get();

}

-scoped_ptr<KeyedService> AccountReconcilorFactory::BuildServiceInstanceFor(

+std::unique_ptr<KeyedService> AccountReconcilorFactory::BuildServiceInstanceFor(

web::BrowserState* context) const {

ios::ChromeBrowserState* chrome_browser_state =

ios::ChromeBrowserState::FromBrowserState(context);

- scoped_ptr<AccountReconcilor> reconcilor(new AccountReconcilor(

+ std::unique_ptr<AccountReconcilor> reconcilor(new AccountReconcilor(

OAuth2TokenServiceFactory::GetForBrowserState(chrome_browser_state),

SigninManagerFactory::GetForBrowserState(chrome_browser_state),

SigninClientFactory::GetForBrowserState(chrome_browser_state),