diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-05-09 14:22:11 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-05-09 15:11:45 +0000 |
| commit | 2ddb2d3e14eef3de7dbd0cef553d669b9ac2361c (patch) | |
| tree | e75f511546c5fd1a173e87c1f9fb11d7ac8d1af3 /chromium/crypto/sha2.cc | |
| parent | a4f3d46271c57e8155ba912df46a05559d14726e (diff) | |
| download | qtwebengine-chromium-2ddb2d3e14eef3de7dbd0cef553d669b9ac2361c.tar.gz | |
BASELINE: Update Chromium to 51.0.2704.41
Also adds in all smaller components by reversing logic for exclusion.
Change-Id: Ibf90b506e7da088ea2f65dcf23f2b0992c504422
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'chromium/crypto/sha2.cc')
| -rw-r--r-- | chromium/crypto/sha2.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chromium/crypto/sha2.cc b/chromium/crypto/sha2.cc index 2646d1bbd15..e97b8f40376 100644 --- a/chromium/crypto/sha2.cc +++ b/chromium/crypto/sha2.cc @@ -6,14 +6,15 @@ #include <stddef.h> -#include "base/memory/scoped_ptr.h" +#include <memory> + #include "base/stl_util.h" #include "crypto/secure_hash.h" namespace crypto { void SHA256HashString(const base::StringPiece& str, void* output, size_t len) { - scoped_ptr<SecureHash> ctx(SecureHash::Create(SecureHash::SHA256)); + std::unique_ptr<SecureHash> ctx(SecureHash::Create(SecureHash::SHA256)); ctx->Update(str.data(), str.length()); ctx->Finish(output, len); } |