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

Unified Diff: net/socket/ssl_client_socket_unittest.cc

Issue 2400033005: Use BoringSSL scopers in //net. (Closed)
Patch Set: eroman comments Created 4 years, 2 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 | « net/socket/ssl_client_socket_impl.cc ('k') | net/socket/ssl_server_socket_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/ssl_client_socket_unittest.cc
diff --git a/net/socket/ssl_client_socket_unittest.cc b/net/socket/ssl_client_socket_unittest.cc
index 2284ee36410daa34cfcde914091b890b930937bb..256c71ff6f3bc2bfcef79002045b15ca3f735cef 100644
--- a/net/socket/ssl_client_socket_unittest.cc
+++ b/net/socket/ssl_client_socket_unittest.cc
@@ -22,7 +22,6 @@
#include "base/single_thread_task_runner.h"
#include "base/threading/thread_task_runner_handle.h"
#include "base/time/time.h"
-#include "crypto/scoped_openssl_types.h"
#include "net/base/address_list.h"
#include "net/base/io_buffer.h"
#include "net/base/net_errors.h"
@@ -3140,13 +3139,13 @@ scoped_refptr<SSLPrivateKey> LoadPrivateKeyOpenSSL(
LOG(ERROR) << "Could not read private key file: " << filepath.value();
return nullptr;
}
- crypto::ScopedBIO bio(BIO_new_mem_buf(const_cast<char*>(data.data()),
- static_cast<int>(data.size())));
+ bssl::UniquePtr<BIO> bio(BIO_new_mem_buf(const_cast<char*>(data.data()),
+ static_cast<int>(data.size())));
if (!bio) {
LOG(ERROR) << "Could not allocate BIO for buffer?";
return nullptr;
}
- crypto::ScopedEVP_PKEY result(
+ bssl::UniquePtr<EVP_PKEY> result(
PEM_read_bio_PrivateKey(bio.get(), nullptr, nullptr, nullptr));
if (!result) {
LOG(ERROR) << "Could not decode private key file: " << filepath.value();
« no previous file with comments | « net/socket/ssl_client_socket_impl.cc ('k') | net/socket/ssl_server_socket_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698