| OLD | NEW |
|---|
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "net/ssl/test_ssl_private_key.h" | 5 #include "net/ssl/test_ssl_private_key.h" |
| 6 | 6 |
| 7 #include <openssl/digest.h> | 7 #include <openssl/digest.h> |
| 8 #include <openssl/evp.h> | 8 #include <openssl/evp.h> |
| 9 | 9 |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 116 type = SSLPrivateKey::Type::RSA; | 116 type = SSLPrivateKey::Type::RSA; |
| 117 break; | 117 break; |
| 118 case EVP_PKEY_EC: | 118 case EVP_PKEY_EC: |
| 119 type = SSLPrivateKey::Type::ECDSA; | 119 type = SSLPrivateKey::Type::ECDSA; |
| 120 break; | 120 break; |
| 121 default: | 121 default: |
| 122 LOG(ERROR) << "Unknown key type: " << EVP_PKEY_id(key.get()); | 122 LOG(ERROR) << "Unknown key type: " << EVP_PKEY_id(key.get()); |
| 123 return nullptr; | 123 return nullptr; |
| 124 } | 124 } |
| 125 return make_scoped_refptr(new ThreadedSSLPrivateKey( | 125 return make_scoped_refptr(new ThreadedSSLPrivateKey( |
| 126 base::WrapUnique(new TestSSLPlatformKey(std::move(key), type)), | 126 base::MakeUnique<TestSSLPlatformKey>(std::move(key), type), |
| 127 GetSSLPlatformKeyTaskRunner())); | 127 GetSSLPlatformKeyTaskRunner())); |
| 128 } | 128 } |
| 129 | 129 |
| 130 } // namespace net | 130 } // namespace net |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2259823002:
Re-write many calls to WrapUnique() with MakeUnique() (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master