Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1648)

Side by Side Diff: crypto/scoped_test_system_nss_key_slot.h

Issue 1870233002: Convert crypto to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comment 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 unified diff | Download patch
« no previous file with comments | « crypto/scoped_openssl_types.h ('k') | crypto/secure_hash_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CRYPTO_SCOPED_TEST_SYSTEM_NSS_KEY_SLOT_H_ 5 #ifndef CRYPTO_SCOPED_TEST_SYSTEM_NSS_KEY_SLOT_H_
6 #define CRYPTO_SCOPED_TEST_SYSTEM_NSS_KEY_SLOT_H_ 6 #define CRYPTO_SCOPED_TEST_SYSTEM_NSS_KEY_SLOT_H_
7 7
8 #include <memory>
9
8 #include "base/macros.h" 10 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h"
10 #include "crypto/crypto_export.h" 11 #include "crypto/crypto_export.h"
11 12
12 // Forward declaration, from <pk11pub.h> 13 // Forward declaration, from <pk11pub.h>
13 typedef struct PK11SlotInfoStr PK11SlotInfo; 14 typedef struct PK11SlotInfoStr PK11SlotInfo;
14 15
15 namespace crypto { 16 namespace crypto {
16 17
17 class ScopedTestNSSDB; 18 class ScopedTestNSSDB;
18 19
19 // Opens a persistent NSS software database in a temporary directory and sets 20 // Opens a persistent NSS software database in a temporary directory and sets
20 // the test system slot to the opened database. This helper should be created in 21 // the test system slot to the opened database. This helper should be created in
21 // tests to fake the system token that is usually provided by the Chaps module. 22 // tests to fake the system token that is usually provided by the Chaps module.
22 // |slot| is exposed through |GetSystemNSSKeySlot| and |IsTPMTokenReady| will 23 // |slot| is exposed through |GetSystemNSSKeySlot| and |IsTPMTokenReady| will
23 // return true. 24 // return true.
24 // |InitializeTPMTokenAndSystemSlot|, which triggers the TPM initialization, 25 // |InitializeTPMTokenAndSystemSlot|, which triggers the TPM initialization,
25 // does not have to be called if this helper is used. 26 // does not have to be called if this helper is used.
26 // At most one instance of this helper must be used at a time. 27 // At most one instance of this helper must be used at a time.
27 class CRYPTO_EXPORT ScopedTestSystemNSSKeySlot { 28 class CRYPTO_EXPORT ScopedTestSystemNSSKeySlot {
28 public: 29 public:
29 explicit ScopedTestSystemNSSKeySlot(); 30 explicit ScopedTestSystemNSSKeySlot();
30 ~ScopedTestSystemNSSKeySlot(); 31 ~ScopedTestSystemNSSKeySlot();
31 32
32 bool ConstructedSuccessfully() const; 33 bool ConstructedSuccessfully() const;
33 PK11SlotInfo* slot() const; 34 PK11SlotInfo* slot() const;
34 35
35 private: 36 private:
36 scoped_ptr<ScopedTestNSSDB> test_db_; 37 std::unique_ptr<ScopedTestNSSDB> test_db_;
37 38
38 DISALLOW_COPY_AND_ASSIGN(ScopedTestSystemNSSKeySlot); 39 DISALLOW_COPY_AND_ASSIGN(ScopedTestSystemNSSKeySlot);
39 }; 40 };
40 41
41 } // namespace crypto 42 } // namespace crypto
42 43
43 #endif // CRYPTO_SCOPED_TEST_SYSTEM_NSS_KEY_SLOT_H_ 44 #endif // CRYPTO_SCOPED_TEST_SYSTEM_NSS_KEY_SLOT_H_
OLDNEW
« no previous file with comments | « crypto/scoped_openssl_types.h ('k') | crypto/secure_hash_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698