summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authordcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-09 17:35:42 +0000
committerdcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-09 17:35:42 +0000
commite8328959446df06daed33e7310e935df5496a0b7 (patch)
tree2fe2476213f85e2bb475054f956ba89ec4b87f3b /crypto
parent1427cd5c47cc8c09c8020ed3f1b9ddec4e6e5b60 (diff)
downloadchromium_src-e8328959446df06daed33e7310e935df5496a0b7.zip
chromium_src-e8328959446df06daed33e7310e935df5496a0b7.tar.gz
chromium_src-e8328959446df06daed33e7310e935df5496a0b7.tar.bz2
Finish scoped_array<T> to scoped_ptr<T[]> conversion on Linux.
There are only a few instances left in the Linux build, so lumping them all into one patch. BUG=171111 Review URL: https://codereview.chromium.org/13916003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193134 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'crypto')
-rw-r--r--crypto/hmac.cc2
-rw-r--r--crypto/nss_util.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/crypto/hmac.cc b/crypto/hmac.cc
index 126d124..c9a2b74 100644
--- a/crypto/hmac.cc
+++ b/crypto/hmac.cc
@@ -45,7 +45,7 @@ bool HMAC::VerifyTruncated(const base::StringPiece& data,
if (digest.empty())
return false;
size_t digest_length = DigestLength();
- scoped_array<unsigned char> computed_digest(
+ scoped_ptr<unsigned char[]> computed_digest(
new unsigned char[digest_length]);
if (!Sign(data, computed_digest.get(), digest_length))
return false;
diff --git a/crypto/nss_util.cc b/crypto/nss_util.cc
index 0d4b1141..9cd0cd1 100644
--- a/crypto/nss_util.cc
+++ b/crypto/nss_util.cc
@@ -69,7 +69,7 @@ static const base::FilePath::CharType kReadOnlyCertDB[] =
std::string GetNSSErrorMessage() {
std::string result;
if (PR_GetErrorTextLength()) {
- scoped_array<char> error_text(new char[PR_GetErrorTextLength() + 1]);
+ scoped_ptr<char[]> error_text(new char[PR_GetErrorTextLength() + 1]);
PRInt32 copied = PR_GetErrorText(error_text.get());
result = std::string(error_text.get(), copied);
} else {