chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api.h - Issue 1871713002: Convert //chrome/browser/extensions from scoped_ptr to std::unique_ptr

Unified Diff: chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api.h

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

Patch Set: Rebase and fix header 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/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc ('k') | chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api.h

diff --git a/chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api.h b/chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api.h

index 98bb8d202851f3fe5615f83f817b180e6d726ca7..24adc2d8f9e5a7d00b7b457da75c90008c3c6a24 100644

--- a/chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api.h

+++ b/chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api.h

@@ -8,11 +8,11 @@

#ifndef CHROME_BROWSER_EXTENSIONS_API_ENTERPRISE_PLATFORM_KEYS_PRIVATE_ENTERPRISE_PLATFORM_KEYS_PRIVATE_API_H__

#define CHROME_BROWSER_EXTENSIONS_API_ENTERPRISE_PLATFORM_KEYS_PRIVATE_ENTERPRISE_PLATFORM_KEYS_PRIVATE_API_H__

+#include <memory>

#include <string>

#include "base/callback.h"

#include "base/compiler_specific.h"

-#include "base/memory/scoped_ptr.h"

#include "chrome/common/extensions/api/enterprise_platform_keys_private.h"

#include "chromeos/attestation/attestation_constants.h"

#include "chromeos/attestation/attestation_flow.h"

@@ -116,7 +116,8 @@ class EPKPChallengeKeyBase {

chromeos::CryptohomeClient* cryptohome_client_;

cryptohome::AsyncMethodCaller* async_caller_;

chromeos::attestation::AttestationFlow* attestation_flow_;

- scoped_ptr<chromeos::attestation::AttestationFlow> default_attestation_flow_;

+ std::unique_ptr<chromeos::attestation::AttestationFlow>

+ default_attestation_flow_;

ChallengeKeyCallback callback_;

Profile* profile_;

std::string extension_id_;

@@ -260,7 +261,7 @@ class EnterprisePlatformKeysPrivateChallengeMachineKeyFunction

// Otherwise |success| will be false and |data| is an error message.

void OnChallengedKey(bool success, const std::string& data);

- scoped_ptr<EPKPChallengeMachineKey> default_impl_;

+ std::unique_ptr<EPKPChallengeMachineKey> default_impl_;

EPKPChallengeMachineKey* impl_;

DECLARE_EXTENSION_FUNCTION(

@@ -284,7 +285,7 @@ class EnterprisePlatformKeysPrivateChallengeUserKeyFunction

// Otherwise |success| will be false and |data| is an error message.

void OnChallengedKey(bool success, const std::string& data);

- scoped_ptr<EPKPChallengeUserKey> default_impl_;

+ std::unique_ptr<EPKPChallengeUserKey> default_impl_;

EPKPChallengeUserKey* impl_;

DECLARE_EXTENSION_FUNCTION(