Refactor Pickle Read methods to use higher performance PickleIterator.

base/pickle_unittest.cc

Index: base/pickle_unittest.cc
diff --git a/base/pickle_unittest.cc b/base/pickle_unittest.cc
index 07be5e36ff83b0e3de2d7512db98f08fabe90d10..8cb1d2a170c23e52e01d4798006338dc74ae3153 100644
--- a/base/pickle_unittest.cc
+++ b/base/pickle_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -23,7 +23,7 @@ const uint16 testuint16 = 32123;
 
 // checks that the result
 void VerifyResult(const Pickle& pickle) {
-  void* iter = NULL;
+  PickleIterator iter(pickle);
 
   int outint;
   EXPECT_TRUE(pickle.ReadInt(&iter, &outint));
@@ -100,7 +100,7 @@ TEST(PickleTest, SmallBuffer) {
   // We should not touch the buffer.
   Pickle pickle(buffer.get(), 1);
 
-  void* iter = NULL;
+  PickleIterator iter(pickle);
   int data;
   EXPECT_FALSE(pickle.ReadInt(&iter, &data));
 }
@@ -111,7 +111,7 @@ TEST(PickleTest, BigSize) {
 
   Pickle pickle(reinterpret_cast<char*>(buffer), sizeof(buffer));
 
-  void* iter = NULL;
+  PickleIterator iter(pickle);
   int data;
   EXPECT_FALSE(pickle.ReadInt(&iter, &data));
 }
@@ -121,7 +121,7 @@ TEST(PickleTest, UnalignedSize) {
 
   Pickle pickle(reinterpret_cast<char*>(buffer), sizeof(buffer));
 
-  void* iter = NULL;
+  PickleIterator iter(pickle);
   int data;
   EXPECT_FALSE(pickle.ReadInt(&iter, &data));
 }
@@ -130,7 +130,7 @@ TEST(PickleTest, ZeroLenStr) {
   Pickle pickle;
   EXPECT_TRUE(pickle.WriteString(""));
 
-  void* iter = NULL;
+  PickleIterator iter(pickle);
   std::string outstr;
   EXPECT_TRUE(pickle.ReadString(&iter, &outstr));
   EXPECT_EQ("", outstr);
@@ -140,7 +140,7 @@ TEST(PickleTest, ZeroLenWStr) {
   Pickle pickle;
   EXPECT_TRUE(pickle.WriteWString(L""));
 
-  void* iter = NULL;
+  PickleIterator iter(pickle);
   std::string outstr;
   EXPECT_TRUE(pickle.ReadString(&iter, &outstr));
   EXPECT_EQ("", outstr);
@@ -150,7 +150,7 @@ TEST(PickleTest, BadLenStr) {
   Pickle pickle;
   EXPECT_TRUE(pickle.WriteInt(-2));
 
-  void* iter = NULL;
+  PickleIterator iter(pickle);
   std::string outstr;
   EXPECT_FALSE(pickle.ReadString(&iter, &outstr));
 }
@@ -159,7 +159,7 @@ TEST(PickleTest, BadLenWStr) {
   Pickle pickle;
   EXPECT_TRUE(pickle.WriteInt(-1));
 
-  void* iter = NULL;
+  PickleIterator iter(pickle);
   std::wstring woutstr;
   EXPECT_FALSE(pickle.ReadWString(&iter, &woutstr));
 }
@@ -188,19 +188,23 @@ TEST(PickleTest, FindNextWithIncompleteHeader) {
   EXPECT_TRUE(NULL == Pickle::FindNext(header_size, start, end));
 }
 
-TEST(PickleTest, IteratorHasRoom) {
+TEST(PickleTest, GetReadPointerAndAdvance) {
   Pickle pickle;
+
+  PickleIterator iter(pickle);
+  EXPECT_FALSE(iter.GetReadPointerAndAdvance(1));
+
   EXPECT_TRUE(pickle.WriteInt(1));
   EXPECT_TRUE(pickle.WriteInt(2));
-
-  const void* iter = 0;
-  EXPECT_FALSE(pickle.IteratorHasRoomFor(iter, 1));
-  iter = pickle.payload();
-  EXPECT_TRUE(pickle.IteratorHasRoomFor(iter, 0));
-  EXPECT_TRUE(pickle.IteratorHasRoomFor(iter, 1));
-  EXPECT_FALSE(pickle.IteratorHasRoomFor(iter, -1));
-  EXPECT_TRUE(pickle.IteratorHasRoomFor(iter, sizeof(int) * 2));
-  EXPECT_FALSE(pickle.IteratorHasRoomFor(iter, (sizeof(int) * 2) + 1));
+  int bytes = sizeof(int) * 2;
+
+  EXPECT_TRUE(PickleIterator(pickle).GetReadPointerAndAdvance(0));
+  EXPECT_TRUE(PickleIterator(pickle).GetReadPointerAndAdvance(1));
+  EXPECT_FALSE(PickleIterator(pickle).GetReadPointerAndAdvance(-1));
+  EXPECT_TRUE(PickleIterator(pickle).GetReadPointerAndAdvance(bytes));
+  EXPECT_FALSE(PickleIterator(pickle).GetReadPointerAndAdvance(bytes + 1));
+  EXPECT_FALSE(PickleIterator(pickle).GetReadPointerAndAdvance(INT_MAX));
+  EXPECT_FALSE(PickleIterator(pickle).GetReadPointerAndAdvance(INT_MIN));
 }
 
 TEST(PickleTest, Resize) {
@@ -252,7 +256,7 @@ TEST(PickleTest, HeaderPadding) {
   // this should not overwrite the 'int' payload
   pickle.headerT<CustomHeader>()->blah = 10;
 
-  void* iter = NULL;
+  PickleIterator iter(pickle);
   int result;
   ASSERT_TRUE(pickle.ReadInt(&iter, &result));
 
@@ -273,25 +277,32 @@ TEST(PickleTest, EqualsOperator) {
 TEST(PickleTest, EvilLengths) {
   Pickle source;
   std::string str(100000, 'A');
-  source.WriteData(str.c_str(), 100000);
+  EXPECT_TRUE(source.WriteData(str.c_str(), 100000));
   // ReadString16 used to have its read buffer length calculation wrong leading
   // to out-of-bounds reading.
-  void* iter = NULL;
+  PickleIterator iter(source);
   string16 str16;
   EXPECT_FALSE(source.ReadString16(&iter, &str16));
 
   // And check we didn't break ReadString16.
   str16 = (wchar_t) 'A';
   Pickle str16_pickle;
-  str16_pickle.WriteString16(str16);
-  iter = NULL;
+  EXPECT_TRUE(str16_pickle.WriteString16(str16));
+  iter = PickleIterator(str16_pickle);
   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.
+  // (1<<31) * sizeof(char16) == 0, so this is particularly evil.
+  Pickle bad_len;
+  EXPECT_TRUE(bad_len.WriteInt(1 << 31));
+  iter = PickleIterator(bad_len);
+  EXPECT_FALSE(bad_len.ReadString16(&iter, &str16));
+
   // Check we don't fail in a length check with large WStrings.
   Pickle big_len;
-  big_len.WriteInt(1 << 30);
-  iter = NULL;
+  EXPECT_TRUE(big_len.WriteInt(1 << 30));
+  iter = PickleIterator(big_len);
   std::wstring wstr;
   EXPECT_FALSE(big_len.ReadWString(&iter, &wstr));
 }
@@ -301,7 +312,7 @@ TEST(PickleTest, ZeroLength) {
   Pickle pickle;
   EXPECT_TRUE(pickle.WriteData(NULL, 0));
 
-  void* iter = NULL;
+  PickleIterator iter(pickle);
   const char* outdata;
   int outdatalen;
   EXPECT_TRUE(pickle.ReadData(&iter, &outdata, &outdatalen));
@@ -315,8 +326,8 @@ TEST(PickleTest, ReadBytes) {
   int data = 0x7abcd;
   EXPECT_TRUE(pickle.WriteBytes(&data, sizeof(data)));
 
-  void* iter = NULL;
-  const char* outdata_char;
+  PickleIterator iter(pickle);
+  const char* outdata_char = NULL;
   EXPECT_TRUE(pickle.ReadBytes(&iter, &outdata_char, sizeof(data)));
 
   int outdata;