summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorbrettw <brettw@chromium.org>2015-06-02 21:29:25 -0700
committerCommit bot <commit-bot@chromium.org>2015-06-03 04:30:27 +0000
commitbd4d71128239a38fa844c42e4110458109a8b135 (patch)
tree47ff0ad11b9270fb410d93632fd63a0c78218176 /crypto
parent6f89d8f965bae07a352ee82abe1fb551f65d65e1 (diff)
downloadchromium_src-bd4d71128239a38fa844c42e4110458109a8b135.zip
chromium_src-bd4d71128239a38fa844c42e4110458109a8b135.tar.gz
chromium_src-bd4d71128239a38fa844c42e4110458109a8b135.tar.bz2
Change most uses of Pickle to base::Pickle
There should be no behavior change. TBR=jschuh (IPC messages) Review URL: https://codereview.chromium.org/1154283003 Cr-Commit-Position: refs/heads/master@{#332552}
Diffstat (limited to 'crypto')
-rw-r--r--crypto/secure_hash_default.cc8
-rw-r--r--crypto/secure_hash_openssl.cc8
-rw-r--r--crypto/secure_hash_unittest.cc4
3 files changed, 10 insertions, 10 deletions
diff --git a/crypto/secure_hash_default.cc b/crypto/secure_hash_default.cc
index 262beb7..739b402 100644
--- a/crypto/secure_hash_default.cc
+++ b/crypto/secure_hash_default.cc
@@ -35,14 +35,14 @@ class SecureHashSHA256NSS : public SecureHash {
static_cast<unsigned int>(len));
}
- 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:
SHA256Context ctx_;
};
-bool SecureHashSHA256NSS::Serialize(Pickle* pickle) {
+bool SecureHashSHA256NSS::Serialize(base::Pickle* pickle) {
if (!pickle)
return false;
@@ -55,7 +55,7 @@ bool SecureHashSHA256NSS::Serialize(Pickle* pickle) {
return true;
}
-bool SecureHashSHA256NSS::Deserialize(PickleIterator* data_iterator) {
+bool SecureHashSHA256NSS::Deserialize(base::PickleIterator* data_iterator) {
int version;
if (!data_iterator->ReadInt(&version))
return false;
diff --git a/crypto/secure_hash_openssl.cc b/crypto/secure_hash_openssl.cc
index ee1993c..1033b8e 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;
diff --git a/crypto/secure_hash_unittest.cc b/crypto/secure_hash_unittest.cc
index c21c365..facf476 100644
--- a/crypto/secure_hash_unittest.cc
+++ b/crypto/secure_hash_unittest.cc
@@ -53,7 +53,7 @@ TEST(SecureHashTest, TestSerialization) {
crypto::SecureHash::SHA256));
scoped_ptr<crypto::SecureHash> ctx2(crypto::SecureHash::Create(
crypto::SecureHash::SHA256));
- Pickle pickle;
+ base::Pickle pickle;
ctx1->Update(input1.data(), input1.size());
ctx1->Update(input2.data(), input2.size());
ctx1->Update(input3.data(), input3.size());
@@ -64,7 +64,7 @@ TEST(SecureHashTest, TestSerialization) {
ctx1->Finish(output1, sizeof(output1));
- PickleIterator data_iterator(pickle);
+ base::PickleIterator data_iterator(pickle);
EXPECT_TRUE(ctx2->Deserialize(&data_iterator));
ctx2->Update(input4.data(), input4.size());
ctx2->Update(input5.data(), input5.size());