commit 609cb79ecaa27ab1b09bc41034501d048614d4e2
author Ben Chan <benchan@chromium.org> Tue Dec 13 05:35:58 2016
committer chrome-bot <chrome-bot@chromium.org> Tue Dec 13 12:21:36 2016
tree fc080ab736e4fda19e92c4e79a9a640290d18871
parent b86156c4a5e2cb10b69a2bccbade9b8d359f3662

Remove remaining references to scoped_ptr.

The last uprev of libchrome to r395517 missed some of the "scoped_ptr to
std::unique_ptr" changes done in http://crrev.com/386228.

BUG=chromium:672314
TEST=Trybot run on paladin and release builders.

Change-Id: Ieb0d6a59e0f122e63d4a986756f2764b5465018b
Reviewed-on: https://chromium-review.googlesource.com/419143
Commit-Ready: Ben Chan <benchan@chromium.org>
Tested-by: Ben Chan <benchan@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>

crypto/hmac.cc

diff --git a/crypto/hmac.cc b/crypto/hmac.cc
index af5580b..333e357 100644
--- a/crypto/hmac.cc
+++ b/crypto/hmac.cc
@@ -7,6 +7,7 @@
 #include <stddef.h>
 
 #include <algorithm>
+#include <memory>
 
 #include "base/logging.h"
 #include "crypto/secure_util.h"

crypto/hmac_nss.cc

diff --git a/crypto/hmac_nss.cc b/crypto/hmac_nss.cc
index 9d759b5..2547860 100644
--- a/crypto/hmac_nss.cc
+++ b/crypto/hmac_nss.cc
@@ -8,8 +8,9 @@
 #include <pk11pub.h>
 #include <stddef.h>
 
+#include <memory>
+
 #include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
 #include "crypto/nss_util.h"
 #include "crypto/scoped_nss_types.h"
 

crypto/rsa_private_key.cc

diff --git a/crypto/rsa_private_key.cc b/crypto/rsa_private_key.cc
index c546c91..1027d07 100644
--- a/crypto/rsa_private_key.cc
+++ b/crypto/rsa_private_key.cc
@@ -10,7 +10,6 @@
 #include <algorithm>
 
 #include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/strings/string_util.h"
 
 // This file manually encodes and decodes RSA private keys using PrivateKeyInfo

crypto/rsa_private_key_nss.cc

diff --git a/crypto/rsa_private_key_nss.cc b/crypto/rsa_private_key_nss.cc
index b1026c1..4081454 100644
--- a/crypto/rsa_private_key_nss.cc
+++ b/crypto/rsa_private_key_nss.cc
@@ -10,9 +10,9 @@
 #include <stdint.h>
 
 #include <list>
+#include <memory>
 
 #include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/strings/string_util.h"
 #include "crypto/nss_key_util.h"
 #include "crypto/nss_util.h"

crypto/signature_creator_nss.cc

diff --git a/crypto/signature_creator_nss.cc b/crypto/signature_creator_nss.cc
index bf20413..538be93 100644
--- a/crypto/signature_creator_nss.cc
+++ b/crypto/signature_creator_nss.cc
@@ -9,8 +9,9 @@
 #include <stdint.h>
 #include <stdlib.h>
 
+#include <memory>
+
 #include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
 #include "crypto/nss_util.h"
 #include "crypto/rsa_private_key.h"
 
@@ -50,7 +51,7 @@
 // static
 SignatureCreator* SignatureCreator::Create(RSAPrivateKey* key,
                                            HashAlgorithm hash_alg) {
-  scoped_ptr<SignatureCreator> result(new SignatureCreator);
+  std::unique_ptr<SignatureCreator> result(new SignatureCreator);
   result->sign_context_ = SGN_NewContext(ToNSSSigOid(hash_alg), key->key());
   if (!result->sign_context_) {
     NOTREACHED();