chrome/browser/chromeos/settings/token_encryptor.h - 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/settings/token_encryptor.h

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

Index: chrome/browser/chromeos/settings/token_encryptor.h

diff --git a/chrome/browser/chromeos/settings/token_encryptor.h b/chrome/browser/chromeos/settings/token_encryptor.h

index 00d8edc24d9a6c383adc6a82ba93d8acfe363d6b..0ef1008bd56c81b54b2ee3d5711238d0a2cebe4a 100644

--- a/chrome/browser/chromeos/settings/token_encryptor.h

+++ b/chrome/browser/chromeos/settings/token_encryptor.h

@@ -5,10 +5,10 @@

#ifndef CHROME_BROWSER_CHROMEOS_SETTINGS_TOKEN_ENCRYPTOR_H_

#define CHROME_BROWSER_CHROMEOS_SETTINGS_TOKEN_ENCRYPTOR_H_

+#include <memory>

#include <string>

#include "base/macros.h"

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

namespace crypto {

class SymmetricKey;

@@ -66,7 +66,7 @@ class CryptohomeTokenEncryptor : public TokenEncryptor {

// A key based on the system salt. Useful for encrypting device-level

// data for which we have no additional credentials.

- scoped_ptr<crypto::SymmetricKey> system_salt_key_;

+ std::unique_ptr<crypto::SymmetricKey> system_salt_key_;

DISALLOW_COPY_AND_ASSIGN(CryptohomeTokenEncryptor);

};