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

Unified Diff: net/android/keystore_openssl.cc

Issue 1893083002: Change scoped_ptr to std::unique_ptr in //net. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scopedptr-net-all: iwyu 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 | « net/android/http_auth_negotiate_android.h ('k') | net/android/network_change_notifier_android.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/android/keystore_openssl.cc
diff --git a/net/android/keystore_openssl.cc b/net/android/keystore_openssl.cc
index f60842cfda9676a1ce311ed47671aadbee2a52cd..7437e1a6f0b3e883ada0185bd9b2a6271354f005 100644
--- a/net/android/keystore_openssl.cc
+++ b/net/android/keystore_openssl.cc
@@ -13,11 +13,12 @@
#include <openssl/rsa.h>
#include <stdint.h>
+#include <memory>
+
#include "base/android/build_info.h"
#include "base/android/scoped_java_ref.h"
#include "base/lazy_instance.h"
#include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
#include "crypto/openssl_util.h"
#include "net/android/keystore.h"
#include "net/android/legacy_openssl.h"
@@ -330,7 +331,7 @@ crypto::ScopedEVP_PKEY CreateRsaPkeyWrapper(
return nullptr;
}
- scoped_ptr<KeyExData> ex_data(new KeyExData);
+ std::unique_ptr<KeyExData> ex_data(new KeyExData);
ex_data->private_key.Reset(nullptr, private_key);
if (ex_data->private_key.is_null()) {
LOG(ERROR) << "Could not create global JNI reference";
@@ -500,7 +501,7 @@ crypto::ScopedEVP_PKEY GetEcdsaPkeyWrapper(jobject private_key) {
return nullptr;
}
- scoped_ptr<KeyExData> ex_data(new KeyExData);
+ std::unique_ptr<KeyExData> ex_data(new KeyExData);
ex_data->private_key.Reset(nullptr, private_key);
if (ex_data->private_key.is_null()) {
LOG(ERROR) << "Can't create global JNI reference";
« no previous file with comments | « net/android/http_auth_negotiate_android.h ('k') | net/android/network_change_notifier_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698