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

Unified Diff: components/nacl/browser/nacl_validation_cache_unittest.cc

Issue 1154283003: Change most uses of Pickle to base::Pickle (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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 | « components/nacl/browser/nacl_validation_cache.cc ('k') | components/nacl/loader/nacl_helper_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/nacl/browser/nacl_validation_cache_unittest.cc
diff --git a/components/nacl/browser/nacl_validation_cache_unittest.cc b/components/nacl/browser/nacl_validation_cache_unittest.cc
index 945db2fcfeccb387197b82e2b59a52843311fa80..00378d0d9023da554e084be8bd68a8c22148b131 100644
--- a/components/nacl/browser/nacl_validation_cache_unittest.cc
+++ b/components/nacl/browser/nacl_validation_cache_unittest.cc
@@ -144,7 +144,7 @@ TEST_F(NaClValidationCacheTest, SerializeDeserialize) {
cache1.SetKnownToValidate(sig1);
cache1.SetKnownToValidate(sig2);
- Pickle pickle;
+ base::Pickle pickle;
cache1.Serialize(&pickle);
ASSERT_TRUE(cache2.Deserialize(&pickle));
ASSERT_EQ(2, (int) cache2.size());
@@ -157,9 +157,10 @@ TEST_F(NaClValidationCacheTest, SerializeDeserializeTruncated) {
cache1.SetKnownToValidate(sig1);
cache1.SetKnownToValidate(sig2);
- Pickle pickle;
+ base::Pickle pickle;
cache1.Serialize(&pickle);
- Pickle truncated(static_cast<const char*>(pickle.data()), pickle.size()-20);
+ base::Pickle truncated(static_cast<const char*>(pickle.data()),
+ pickle.size() - 20);
ASSERT_FALSE(cache2.Deserialize(&truncated));
ASSERT_EQ(0, (int) cache2.size());
}
@@ -170,7 +171,7 @@ TEST_F(NaClValidationCacheTest, DeserializeBadKey) {
cache1.SetKnownToValidate(sig1);
cache1.SetKnownToValidate(sig2);
- Pickle pickle;
+ base::Pickle pickle;
cache1.Serialize(&pickle);
ASSERT_FALSE(cache2.Deserialize(&pickle));
ASSERT_EQ(0, (int) cache2.size());
@@ -178,14 +179,14 @@ TEST_F(NaClValidationCacheTest, DeserializeBadKey) {
TEST_F(NaClValidationCacheTest, DeserializeNothing) {
cache1.SetKnownToValidate(sig1);
- Pickle pickle("", 0);
+ base::Pickle pickle("", 0);
ASSERT_FALSE(cache1.Deserialize(&pickle));
ASSERT_EQ(0, (int) cache1.size());
}
TEST_F(NaClValidationCacheTest, DeserializeJunk) {
cache1.SetKnownToValidate(sig1);
- Pickle pickle(key1, strlen(key1));
+ base::Pickle pickle(key1, strlen(key1));
ASSERT_FALSE(cache1.Deserialize(&pickle));
ASSERT_EQ(0, (int) cache1.size());
}
« no previous file with comments | « components/nacl/browser/nacl_validation_cache.cc ('k') | components/nacl/loader/nacl_helper_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698