chrome/browser/chromeos/attestation/platform_verification_flow.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/attestation/platform_verification_flow.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/attestation/platform_verification_flow.h ('k') | chrome/browser/chromeos/base/file_flusher_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/attestation/platform_verification_flow.cc

diff --git a/chrome/browser/chromeos/attestation/platform_verification_flow.cc b/chrome/browser/chromeos/attestation/platform_verification_flow.cc

index 794ed3ab3b752afb0adc01945d193650b8815389..2788f04aeec3c2f6996158593a643c0ff8b3227f 100644

--- a/chrome/browser/chromeos/attestation/platform_verification_flow.cc

+++ b/chrome/browser/chromeos/attestation/platform_verification_flow.cc

@@ -156,7 +156,7 @@ PlatformVerificationFlow::PlatformVerificationFlow()

delegate_(NULL),

timeout_delay_(base::TimeDelta::FromSeconds(kTimeoutInSeconds)) {

DCHECK_CURRENTLY_ON(content::BrowserThread::UI);

- scoped_ptr<ServerProxy> attestation_ca_client(new AttestationCAClient());

+ std::unique_ptr<ServerProxy> attestation_ca_client(new AttestationCAClient());

default_attestation_flow_.reset(new AttestationFlow(

async_caller_, cryptohome_client_, std::move(attestation_ca_client)));

attestation_flow_ = default_attestation_flow_.get();

@@ -257,8 +257,8 @@ void PlatformVerificationFlow::OnAttestationPrepared(

void PlatformVerificationFlow::GetCertificate(const ChallengeContext& context,

const AccountId& account_id,

bool force_new_key) {

- scoped_ptr<base::Timer> timer(new base::Timer(false, // Don't retain.

- false)); // Don't repeat.

+ std::unique_ptr<base::Timer> timer(new base::Timer(false, // Don't retain.

+ false)); // Don't repeat.

base::Closure timeout_callback = base::Bind(

&PlatformVerificationFlow::OnCertificateTimeout,

this,

@@ -276,7 +276,7 @@ void PlatformVerificationFlow::GetCertificate(const ChallengeContext& context,

void PlatformVerificationFlow::OnCertificateReady(

const ChallengeContext& context,

const AccountId& account_id,

- scoped_ptr<base::Timer> timer,

+ std::unique_ptr<base::Timer> timer,

bool operation_success,

const std::string& certificate_chain) {

// Log failure before checking the timer so all failures are logged, even if