OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #include "crypto/ec_signature_creator.h" | 5 #include "crypto/ec_signature_creator.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/memory/ptr_util.h" |
8 #include "crypto/ec_signature_creator_impl.h" | 9 #include "crypto/ec_signature_creator_impl.h" |
9 | 10 |
10 namespace crypto { | 11 namespace crypto { |
11 | 12 |
12 namespace { | 13 namespace { |
13 | 14 |
14 ECSignatureCreatorFactory* g_factory_ = NULL; | 15 ECSignatureCreatorFactory* g_factory_ = nullptr; |
15 | 16 |
16 } // namespace | 17 } // namespace |
17 | 18 |
18 // static | 19 // static |
19 ECSignatureCreator* ECSignatureCreator::Create(ECPrivateKey* key) { | 20 std::unique_ptr<ECSignatureCreator> ECSignatureCreator::Create( |
| 21 ECPrivateKey* key) { |
20 if (g_factory_) | 22 if (g_factory_) |
21 return g_factory_->Create(key); | 23 return g_factory_->Create(key); |
22 return new ECSignatureCreatorImpl(key); | 24 return base::MakeUnique<ECSignatureCreatorImpl>(key); |
23 } | 25 } |
24 | 26 |
25 // static | 27 // static |
26 void ECSignatureCreator::SetFactoryForTesting( | 28 void ECSignatureCreator::SetFactoryForTesting( |
27 ECSignatureCreatorFactory* factory) { | 29 ECSignatureCreatorFactory* factory) { |
28 // We should always clear the factory after each test to avoid | 30 // We should always clear the factory after each test to avoid |
29 // use-after-free problems. | 31 // use-after-free problems. |
30 DCHECK(!g_factory_ || !factory); | 32 DCHECK(!g_factory_ || !factory); |
31 g_factory_ = factory; | 33 g_factory_ = factory; |
32 } | 34 } |
33 | 35 |
34 } // namespace crypto | 36 } // namespace crypto |
OLD | NEW |