Revert of Remove deprecated methods from Pickle.

base/pickle_unittest.cc

Index: base/pickle_unittest.cc
diff --git a/base/pickle_unittest.cc b/base/pickle_unittest.cc
index 1fa1f32d49c736548ec36bbb8ac0aeb32c46b28c..20a8d674c1fe09a07cd43ef4e1188b244027ad72 100644
--- a/base/pickle_unittest.cc
+++ b/base/pickle_unittest.cc
@@ -38,67 +38,67 @@
   PickleIterator iter(pickle);
 
   bool outbool;
-  EXPECT_TRUE(iter.ReadBool(&outbool));
+  EXPECT_TRUE(pickle.ReadBool(&iter, &outbool));
   EXPECT_FALSE(outbool);
-  EXPECT_TRUE(iter.ReadBool(&outbool));
+  EXPECT_TRUE(pickle.ReadBool(&iter, &outbool));
   EXPECT_TRUE(outbool);
 
   int outint;
-  EXPECT_TRUE(iter.ReadInt(&outint));
+  EXPECT_TRUE(pickle.ReadInt(&iter, &outint));
   EXPECT_EQ(testint, outint);
 
   long outlong;
-  EXPECT_TRUE(iter.ReadLong(&outlong));
+  EXPECT_TRUE(pickle.ReadLong(&iter, &outlong));
   EXPECT_EQ(testlong, outlong);
 
   uint16 outuint16;
-  EXPECT_TRUE(iter.ReadUInt16(&outuint16));
+  EXPECT_TRUE(pickle.ReadUInt16(&iter, &outuint16));
   EXPECT_EQ(testuint16, outuint16);
 
   uint32 outuint32;
-  EXPECT_TRUE(iter.ReadUInt32(&outuint32));
+  EXPECT_TRUE(pickle.ReadUInt32(&iter, &outuint32));
   EXPECT_EQ(testuint32, outuint32);
 
   int64 outint64;
-  EXPECT_TRUE(iter.ReadInt64(&outint64));
+  EXPECT_TRUE(pickle.ReadInt64(&iter, &outint64));
   EXPECT_EQ(testint64, outint64);
 
   uint64 outuint64;
-  EXPECT_TRUE(iter.ReadUInt64(&outuint64));
+  EXPECT_TRUE(pickle.ReadUInt64(&iter, &outuint64));
   EXPECT_EQ(testuint64, outuint64);
 
   size_t outsizet;
-  EXPECT_TRUE(iter.ReadSizeT(&outsizet));
+  EXPECT_TRUE(pickle.ReadSizeT(&iter, &outsizet));
   EXPECT_EQ(testsizet, outsizet);
 
   float outfloat;
-  EXPECT_TRUE(iter.ReadFloat(&outfloat));
+  EXPECT_TRUE(pickle.ReadFloat(&iter, &outfloat));
   EXPECT_EQ(testfloat, outfloat);
 
   double outdouble;
-  EXPECT_TRUE(iter.ReadDouble(&outdouble));
+  EXPECT_TRUE(pickle.ReadDouble(&iter, &outdouble));
   EXPECT_EQ(testdouble, outdouble);
 
   std::string outstring;
-  EXPECT_TRUE(iter.ReadString(&outstring));
+  EXPECT_TRUE(pickle.ReadString(&iter, &outstring));
   EXPECT_EQ(teststring, outstring);
 
   std::wstring outwstring;
-  EXPECT_TRUE(iter.ReadWString(&outwstring));
+  EXPECT_TRUE(pickle.ReadWString(&iter, &outwstring));
   EXPECT_EQ(testwstring, outwstring);
 
   base::string16 outstring16;
-  EXPECT_TRUE(iter.ReadString16(&outstring16));
+  EXPECT_TRUE(pickle.ReadString16(&iter, &outstring16));
   EXPECT_EQ(teststring16, outstring16);
 
   const char* outdata;
   int outdatalen;
-  EXPECT_TRUE(iter.ReadData(&outdata, &outdatalen));
+  EXPECT_TRUE(pickle.ReadData(&iter, &outdata, &outdatalen));
   EXPECT_EQ(testdatalen, outdatalen);
   EXPECT_EQ(memcmp(testdata, outdata, outdatalen), 0);
 
   // reads past the end should fail
-  EXPECT_FALSE(iter.ReadInt(&outint));
+  EXPECT_FALSE(pickle.ReadInt(&iter, &outint));
 }
 
 }  // namespace
@@ -148,9 +148,9 @@
   if (sizeof(size_t) < sizeof(uint64)) {
     // ReadSizeT() should return false when the original written value can't be
     // represented as a size_t.
-    EXPECT_FALSE(iter.ReadSizeT(&outsizet));
+    EXPECT_FALSE(pickle.ReadSizeT(&iter, &outsizet));
   } else {
-    EXPECT_TRUE(iter.ReadSizeT(&outsizet));
+    EXPECT_TRUE(pickle.ReadSizeT(&iter, &outsizet));
     EXPECT_EQ(testuint64, outsizet);
   }
 }
@@ -164,7 +164,7 @@
 
   PickleIterator iter(pickle);
   int data;
-  EXPECT_FALSE(iter.ReadInt(&data));
+  EXPECT_FALSE(pickle.ReadInt(&iter, &data));
 }
 
 // Tests that we can handle improper headers.
@@ -175,7 +175,7 @@
 
   PickleIterator iter(pickle);
   int data;
-  EXPECT_FALSE(iter.ReadInt(&data));
+  EXPECT_FALSE(pickle.ReadInt(&iter, &data));
 }
 
 TEST(PickleTest, UnalignedSize) {
@@ -185,7 +185,7 @@
 
   PickleIterator iter(pickle);
   int data;
-  EXPECT_FALSE(iter.ReadInt(&data));
+  EXPECT_FALSE(pickle.ReadInt(&iter, &data));
 }
 
 TEST(PickleTest, ZeroLenStr) {
@@ -194,7 +194,7 @@
 
   PickleIterator iter(pickle);
   std::string outstr;
-  EXPECT_TRUE(iter.ReadString(&outstr));
+  EXPECT_TRUE(pickle.ReadString(&iter, &outstr));
   EXPECT_EQ("", outstr);
 }
 
@@ -204,7 +204,7 @@
 
   PickleIterator iter(pickle);
   std::string outstr;
-  EXPECT_TRUE(iter.ReadString(&outstr));
+  EXPECT_TRUE(pickle.ReadString(&iter, &outstr));
   EXPECT_EQ("", outstr);
 }
 
@@ -214,7 +214,7 @@
 
   PickleIterator iter(pickle);
   std::string outstr;
-  EXPECT_FALSE(iter.ReadString(&outstr));
+  EXPECT_FALSE(pickle.ReadString(&iter, &outstr));
 }
 
 TEST(PickleTest, BadLenWStr) {
@@ -223,7 +223,7 @@
 
   PickleIterator iter(pickle);
   std::wstring woutstr;
-  EXPECT_FALSE(iter.ReadWString(&woutstr));
+  EXPECT_FALSE(pickle.ReadWString(&iter, &woutstr));
 }
 
 TEST(PickleTest, FindNext) {
@@ -351,7 +351,7 @@
 
   PickleIterator iter(pickle);
   int result;
-  ASSERT_TRUE(iter.ReadInt(&result));
+  ASSERT_TRUE(pickle.ReadInt(&iter, &result));
 
   EXPECT_EQ(static_cast<uint32>(result), kMagic);
 }
@@ -375,14 +375,14 @@
   // to out-of-bounds reading.
   PickleIterator iter(source);
   string16 str16;
-  EXPECT_FALSE(iter.ReadString16(&str16));
+  EXPECT_FALSE(source.ReadString16(&iter, &str16));
 
   // And check we didn't break ReadString16.
   str16 = (wchar_t) 'A';
   Pickle str16_pickle;
   EXPECT_TRUE(str16_pickle.WriteString16(str16));
   iter = PickleIterator(str16_pickle);
-  EXPECT_TRUE(iter.ReadString16(&str16));
+  EXPECT_TRUE(str16_pickle.ReadString16(&iter, &str16));
   EXPECT_EQ(1U, str16.length());
 
   // Check we don't fail in a length check with invalid String16 size.
@@ -390,14 +390,14 @@
   Pickle bad_len;
   EXPECT_TRUE(bad_len.WriteInt(1 << 31));
   iter = PickleIterator(bad_len);
-  EXPECT_FALSE(iter.ReadString16(&str16));
+  EXPECT_FALSE(bad_len.ReadString16(&iter, &str16));
 
   // Check we don't fail in a length check with large WStrings.
   Pickle big_len;
   EXPECT_TRUE(big_len.WriteInt(1 << 30));
   iter = PickleIterator(big_len);
   std::wstring wstr;
-  EXPECT_FALSE(iter.ReadWString(&wstr));
+  EXPECT_FALSE(big_len.ReadWString(&iter, &wstr));
 }
 
 // Check we can write zero bytes of data and 'data' can be NULL.
@@ -408,7 +408,7 @@
   PickleIterator iter(pickle);
   const char* outdata;
   int outdatalen;
-  EXPECT_TRUE(iter.ReadData(&outdata, &outdatalen));
+  EXPECT_TRUE(pickle.ReadData(&iter, &outdata, &outdatalen));
   EXPECT_EQ(0, outdatalen);
   // We can't assert that outdata is NULL.
 }
@@ -421,7 +421,7 @@
 
   PickleIterator iter(pickle);
   const char* outdata_char = NULL;
-  EXPECT_TRUE(iter.ReadBytes(&outdata_char, sizeof(data)));
+  EXPECT_TRUE(pickle.ReadBytes(&iter, &outdata_char, sizeof(data)));
 
   int outdata;
   memcpy(&outdata, outdata_char, sizeof(outdata));