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

Unified Diff: crypto/secure_hash_openssl.cc

Issue 1180693002: Update from https://crrev.com/333737 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: rebased Created 5 years, 6 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 | « crypto/secure_hash.h ('k') | crypto/secure_hash_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: crypto/secure_hash_openssl.cc
diff --git a/crypto/secure_hash_openssl.cc b/crypto/secure_hash_openssl.cc
index a2997b4d03e35542d51a5640c88e742fe0991f2e..9e77c3fa5f8f9a3c910ec333a663d5851521c66d 100644
--- a/crypto/secure_hash_openssl.cc
+++ b/crypto/secure_hash_openssl.cc
@@ -40,14 +40,14 @@ class SecureHashSHA256OpenSSL : public SecureHash {
SHA256_Final(result.safe_buffer(), &ctx_);
}
- bool Serialize(Pickle* pickle) override;
- bool Deserialize(PickleIterator* data_iterator) override;
+ bool Serialize(base::Pickle* pickle) override;
+ bool Deserialize(base::PickleIterator* data_iterator) override;
private:
SHA256_CTX ctx_;
};
-bool SecureHashSHA256OpenSSL::Serialize(Pickle* pickle) {
+bool SecureHashSHA256OpenSSL::Serialize(base::Pickle* pickle) {
if (!pickle)
return false;
@@ -60,7 +60,7 @@ bool SecureHashSHA256OpenSSL::Serialize(Pickle* pickle) {
return true;
}
-bool SecureHashSHA256OpenSSL::Deserialize(PickleIterator* data_iterator) {
+bool SecureHashSHA256OpenSSL::Deserialize(base::PickleIterator* data_iterator) {
if (!data_iterator)
return false;
« no previous file with comments | « crypto/secure_hash.h ('k') | crypto/secure_hash_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698