Revert of Remove deprecated methods from Pickle.

ipc/ipc_fuzzing_tests.cc

 // 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.
 
 #include <stdio.h>
 #include <string>
 #include <sstream>
 
 #include "base/message_loop/message_loop.h"
 #include "base/threading/platform_thread.h"
@@ skipping 26 matching lines @@
 TEST(IPCMessageIntegrity, ReadBeyondBufferStr) {
   //This was BUG 984408.
   uint32 v1 = kuint32max - 1;
   int v2 = 666;
   IPC::Message m(0, 1, IPC::Message::PRIORITY_NORMAL);
   EXPECT_TRUE(m.WriteInt(v1));
   EXPECT_TRUE(m.WriteInt(v2));
 
   PickleIterator iter(m);
   std::string vs;
-  EXPECT_FALSE(iter.ReadString(&vs));
+  EXPECT_FALSE(m.ReadString(&iter, &vs));
 }
 
 TEST(IPCMessageIntegrity, ReadBeyondBufferWStr) {
   //This was BUG 984408.
   uint32 v1 = kuint32max - 1;
   int v2 = 777;
   IPC::Message m(0, 1, IPC::Message::PRIORITY_NORMAL);
   EXPECT_TRUE(m.WriteInt(v1));
   EXPECT_TRUE(m.WriteInt(v2));
 
   PickleIterator iter(m);
   std::wstring vs;
-  EXPECT_FALSE(iter.ReadWString(&vs));
+  EXPECT_FALSE(m.ReadWString(&iter, &vs));
 }
 
 TEST(IPCMessageIntegrity, ReadBytesBadIterator) {
   // This was BUG 1035467.
   IPC::Message m(0, 1, IPC::Message::PRIORITY_NORMAL);
   EXPECT_TRUE(m.WriteInt(1));
   EXPECT_TRUE(m.WriteInt(2));
 
   PickleIterator iter(m);
   const char* data = NULL;
-  EXPECT_TRUE(iter.ReadBytes(&data, sizeof(int)));
+  EXPECT_TRUE(m.ReadBytes(&iter, &data, sizeof(int)));
 }
 
 TEST(IPCMessageIntegrity, ReadVectorNegativeSize) {
   // A slight variation of BUG 984408. Note that the pickling of vector<char>
   // has a specialized template which is not vulnerable to this bug. So here
   // try to hit the non-specialized case vector<P>.
   IPC::Message m(0, 1, IPC::Message::PRIORITY_NORMAL);
   EXPECT_TRUE(m.WriteInt(-1));   // This is the count of elements.
   EXPECT_TRUE(m.WriteInt(1));
   EXPECT_TRUE(m.WriteInt(2));
@@ skipping 122 matching lines @@
     base::MessageLoop::current()->Quit();
     return true;
   }
 
   bool ExpectMessage(int value, uint32 type_id) {
     if (!MsgHandlerInternal(type_id))
       return false;
     int msg_value1 = 0;
     int msg_value2 = 0;
     PickleIterator iter(*last_msg_);
-    if (!iter.ReadInt(&msg_value1))
+    if (!last_msg_->ReadInt(&iter, &msg_value1))
       return false;
-    if (!iter.ReadInt(&msg_value2))
+    if (!last_msg_->ReadInt(&iter, &msg_value2))
       return false;
     if ((msg_value2 + 1) != msg_value1)
       return false;
     if (msg_value2 != value)
       return false;
 
     delete last_msg_;
     last_msg_ = NULL;
     return true;
   }
@@ skipping 112 matching lines @@
   // thrown out of sync by the extra argument.
   msg = new MsgClassIS(3, L"expect three");
   sender()->Send(msg);
   EXPECT_TRUE(listener.ExpectMessage(3, MsgClassIS::ID));
 
   EXPECT_TRUE(WaitForClientShutdown());
   DestroyChannel();
 }
 
 }  // namespace