Revert of Remove deprecated methods from Pickle.

ipc/ipc_channel_unittest.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 "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
@@ skipping 21 matching lines @@
   EXPECT_TRUE(m.WriteInt(v1));
   EXPECT_TRUE(m.WriteString(v2));
   EXPECT_TRUE(m.WriteWString(v3));
 
   PickleIterator iter(m);
 
   int vi;
   std::string vs;
   std::wstring vw;
 
-  EXPECT_TRUE(iter.ReadInt(&vi));
+  EXPECT_TRUE(m.ReadInt(&iter, &vi));
   EXPECT_EQ(v1, vi);
 
-  EXPECT_TRUE(iter.ReadString(&vs));
+  EXPECT_TRUE(m.ReadString(&iter, &vs));
   EXPECT_EQ(v2, vs);
 
-  EXPECT_TRUE(iter.ReadWString(&vw));
+  EXPECT_TRUE(m.ReadWString(&iter, &vw));
   EXPECT_EQ(v3, vw);
 
   // should fail
-  EXPECT_FALSE(iter.ReadInt(&vi));
-  EXPECT_FALSE(iter.ReadString(&vs));
-  EXPECT_FALSE(iter.ReadWString(&vw));
+  EXPECT_FALSE(m.ReadInt(&iter, &vi));
+  EXPECT_FALSE(m.ReadString(&iter, &vs));
+  EXPECT_FALSE(m.ReadWString(&iter, &vw));
 }
 
 TEST_F(IPCChannelTest, ChannelTest) {
   Init("GenericClient");
 
   // Set up IPC channel and start client.
   IPC::TestChannelListener listener;
   CreateChannel(&listener);
   listener.Init(sender());
   ASSERT_TRUE(ConnectChannel());
@@ skipping 128 matching lines @@
       &listener));
   CHECK(channel->Connect());
   listener.Init(channel.get());
   IPC::TestChannelListener::SendOneMessage(channel.get(), "hello from child");
 
   base::MessageLoop::current()->Run();
   return 0;
 }
 
 }  // namespace