chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl.cc - Issue 1870793002: Convert //chrome/browser/chromeos 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/chromeos/policy/affiliated_invalidation_service_provider_impl.cc

Issue 1870793002: Convert //chrome/browser/chromeos 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl.h ('k') | chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl.cc

diff --git a/chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl.cc b/chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl.cc

index d853a887e48c9a91874f21b9d0095f4dd3010a7f..9fd75e946f390c1babd8141396b36734e55b3473 100644

--- a/chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl.cc

+++ b/chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl.cc

@@ -307,16 +307,17 @@ AffiliatedInvalidationServiceProviderImpl::FindConnectedInvalidationService() {

device_invalidation_service_.reset(

new invalidation::TiclInvalidationService(

GetUserAgent(),

- scoped_ptr<IdentityProvider>(new chromeos::DeviceIdentityProvider(

- chromeos::DeviceOAuth2TokenServiceFactory::Get())),

- scoped_ptr<invalidation::TiclSettingsProvider>(

+ std::unique_ptr<IdentityProvider>(

+ new chromeos::DeviceIdentityProvider(

+ chromeos::DeviceOAuth2TokenServiceFactory::Get())),

+ std::unique_ptr<invalidation::TiclSettingsProvider>(

new TiclDeviceSettingsProvider),

g_browser_process->gcm_driver(),

g_browser_process->system_request_context()));

device_invalidation_service_->Init(

- scoped_ptr<syncer::InvalidationStateTracker>(

+ std::unique_ptr<syncer::InvalidationStateTracker>(

new invalidation::InvalidatorStorage(

- g_browser_process->local_state())));

+ g_browser_process->local_state())));

device_invalidation_service_observer_.reset(

new InvalidationServiceObserver(

this,