Remove deprecated methods from Pickle.

BUG=444578
TEST=none
R=nasko@chromium.org
TBR=ben@chromium.org

Review URL: https://codereview.chromium.org/818833004

Cr-Commit-Position: refs/heads/master@{#309445}

8 files changed, 46 insertions, 46 deletions

diff --git a/ipc/ipc_channel_posix.cc b/ipc/ipc_channel_posix.cc
index 0852993..1ff3543 100644
--- a/ipc/ipc_channel_posix.cc
+++ b/ipc/ipc_channel_posix.cc
@@ -1005,7 +1005,7 @@ void ChannelPosix::HandleInternalMessage(const Message& msg) {
 
     case Channel::HELLO_MESSAGE_TYPE:
       int pid;
-      if (!msg.ReadInt(&iter, &pid))
+      if (!iter.ReadInt(&pid))
         NOTREACHED();
 
 #if defined(IPC_USES_READWRITE)
@@ -1028,9 +1028,9 @@ void ChannelPosix::HandleInternalMessage(const Message& msg) {
 #if defined(OS_MACOSX)
     case Channel::CLOSE_FD_MESSAGE_TYPE:
       int fd, hops;
-      if (!msg.ReadInt(&iter, &hops))
+      if (!iter.ReadInt(&hops))
         NOTREACHED();
-      if (!msg.ReadInt(&iter, &fd))
+      if (!iter.ReadInt(&fd))
         NOTREACHED();
       if (hops == 0) {
         if (fds_to_close_.erase(fd) > 0) {
diff --git a/ipc/ipc_channel_unittest.cc b/ipc/ipc_channel_unittest.cc
index dd31e9e..383ddb0 100644
--- a/ipc/ipc_channel_unittest.cc
+++ b/ipc/ipc_channel_unittest.cc
@@ -39,19 +39,19 @@ TEST_F(IPCChannelTest, BasicMessageTest) {
   std::string vs;
   std::wstring vw;
 
-  EXPECT_TRUE(m.ReadInt(&iter, &vi));
+  EXPECT_TRUE(iter.ReadInt(&vi));
   EXPECT_EQ(v1, vi);
 
-  EXPECT_TRUE(m.ReadString(&iter, &vs));
+  EXPECT_TRUE(iter.ReadString(&vs));
   EXPECT_EQ(v2, vs);
 
-  EXPECT_TRUE(m.ReadWString(&iter, &vw));
+  EXPECT_TRUE(iter.ReadWString(&vw));
   EXPECT_EQ(v3, vw);
 
   // should fail
-  EXPECT_FALSE(m.ReadInt(&iter, &vi));
-  EXPECT_FALSE(m.ReadString(&iter, &vs));
-  EXPECT_FALSE(m.ReadWString(&iter, &vw));
+  EXPECT_FALSE(iter.ReadInt(&vi));
+  EXPECT_FALSE(iter.ReadString(&vs));
+  EXPECT_FALSE(iter.ReadWString(&vw));
 }
 
 TEST_F(IPCChannelTest, ChannelTest) {
diff --git a/ipc/ipc_fuzzing_tests.cc b/ipc/ipc_fuzzing_tests.cc
index f9475a1..de5aed8 100644
--- a/ipc/ipc_fuzzing_tests.cc
+++ b/ipc/ipc_fuzzing_tests.cc
@@ -44,7 +44,7 @@ TEST(IPCMessageIntegrity, ReadBeyondBufferStr) {
 
   PickleIterator iter(m);
   std::string vs;
-  EXPECT_FALSE(m.ReadString(&iter, &vs));
+  EXPECT_FALSE(iter.ReadString(&vs));
 }
 
 TEST(IPCMessageIntegrity, ReadBeyondBufferWStr) {
@@ -57,7 +57,7 @@ TEST(IPCMessageIntegrity, ReadBeyondBufferWStr) {
 
   PickleIterator iter(m);
   std::wstring vs;
-  EXPECT_FALSE(m.ReadWString(&iter, &vs));
+  EXPECT_FALSE(iter.ReadWString(&vs));
 }
 
 TEST(IPCMessageIntegrity, ReadBytesBadIterator) {
@@ -68,7 +68,7 @@ TEST(IPCMessageIntegrity, ReadBytesBadIterator) {
 
   PickleIterator iter(m);
   const char* data = NULL;
-  EXPECT_TRUE(m.ReadBytes(&iter, &data, sizeof(int)));
+  EXPECT_TRUE(iter.ReadBytes(&data, sizeof(int)));
 }
 
 TEST(IPCMessageIntegrity, ReadVectorNegativeSize) {
@@ -211,9 +211,9 @@ class FuzzerClientListener : public SimpleListener {
     int msg_value1 = 0;
     int msg_value2 = 0;
     PickleIterator iter(*last_msg_);
-    if (!last_msg_->ReadInt(&iter, &msg_value1))
+    if (!iter.ReadInt(&msg_value1))
       return false;
-    if (!last_msg_->ReadInt(&iter, &msg_value2))
+    if (!iter.ReadInt(&msg_value2))
       return false;
     if ((msg_value2 + 1) != msg_value1)
       return false;
diff --git a/ipc/ipc_message.cc b/ipc/ipc_message.cc
index 82b136ac..a6219fe 100644
--- a/ipc/ipc_message.cc
+++ b/ipc/ipc_message.cc
@@ -139,7 +139,7 @@ bool Message::WriteBorrowingFile(const base::PlatformFile& descriptor) {
 
 bool Message::ReadFile(PickleIterator* iter, base::ScopedFD* descriptor) const {
   int descriptor_index;
-  if (!ReadInt(iter, &descriptor_index))
+  if (!iter->ReadInt(&descriptor_index))
     return false;
 
   FileDescriptorSet* file_descriptor_set = file_descriptor_set_.get();
diff --git a/ipc/ipc_message_utils.cc b/ipc/ipc_message_utils.cc
index be8795b..b6e292f 100644
--- a/ipc/ipc_message_utils.cc
+++ b/ipc/ipc_message_utils.cc
@@ -208,7 +208,7 @@ bool ReadValue(const Message* m, PickleIterator* iter, base::Value** value,
     case base::Value::TYPE_BINARY: {
       const char* data;
       int length;
-      if (!m->ReadData(iter, &data, &length))
+      if (!iter->ReadData(&data, &length))
         return false;
       *value = base::BinaryValue::CreateWithCopiedBuffer(data, length);
       break;
@@ -260,7 +260,7 @@ void ParamTraits<unsigned char>::Write(Message* m, const param_type& p) {
 bool ParamTraits<unsigned char>::Read(const Message* m, PickleIterator* iter,
                                        param_type* r) {
   const char* data;
-  if (!m->ReadBytes(iter, &data, sizeof(param_type)))
+  if (!iter->ReadBytes(&data, sizeof(param_type)))
     return false;
   memcpy(r, data, sizeof(param_type));
   return true;
@@ -277,7 +277,7 @@ void ParamTraits<unsigned short>::Write(Message* m, const param_type& p) {
 bool ParamTraits<unsigned short>::Read(const Message* m, PickleIterator* iter,
                                        param_type* r) {
   const char* data;
-  if (!m->ReadBytes(iter, &data, sizeof(param_type)))
+  if (!iter->ReadBytes(&data, sizeof(param_type)))
     return false;
   memcpy(r, data, sizeof(param_type));
   return true;
@@ -322,7 +322,7 @@ void ParamTraits<double>::Write(Message* m, const param_type& p) {
 bool ParamTraits<double>::Read(const Message* m, PickleIterator* iter,
                                param_type* r) {
   const char *data;
-  if (!m->ReadBytes(iter, &data, sizeof(*r))) {
+  if (!iter->ReadBytes(&data, sizeof(*r))) {
     NOTREACHED();
     return false;
   }
@@ -362,7 +362,7 @@ bool ParamTraits<std::vector<char> >::Read(const Message* m,
                                            param_type* r) {
   const char *data;
   int data_size = 0;
-  if (!m->ReadData(iter, &data, &data_size) || data_size < 0)
+  if (!iter->ReadData(&data, &data_size) || data_size < 0)
     return false;
   r->resize(data_size);
   if (data_size)
@@ -389,7 +389,7 @@ bool ParamTraits<std::vector<unsigned char> >::Read(const Message* m,
                                                     param_type* r) {
   const char *data;
   int data_size = 0;
-  if (!m->ReadData(iter, &data, &data_size) || data_size < 0)
+  if (!iter->ReadData(&data, &data_size) || data_size < 0)
     return false;
   r->resize(data_size);
   if (data_size)
@@ -416,7 +416,7 @@ bool ParamTraits<std::vector<bool> >::Read(const Message* m,
                                            param_type* r) {
   int size;
   // ReadLength() checks for < 0 itself.
-  if (!m->ReadLength(iter, &size))
+  if (!iter->ReadLength(&size))
     return false;
   r->resize(size);
   for (int i = 0; i < size; i++) {
@@ -749,14 +749,14 @@ void ParamTraits<Message>::Write(Message* m, const Message& p) {
 bool ParamTraits<Message>::Read(const Message* m, PickleIterator* iter,
                                 Message* r) {
   uint32 routing_id, type, flags;
-  if (!m->ReadUInt32(iter, &routing_id) ||
-      !m->ReadUInt32(iter, &type) ||
-      !m->ReadUInt32(iter, &flags))
+  if (!iter->ReadUInt32(&routing_id) ||
+      !iter->ReadUInt32(&type) ||
+      !iter->ReadUInt32(&flags))
     return false;
 
   int payload_size;
   const char* payload;
-  if (!m->ReadData(iter, &payload, &payload_size))
+  if (!iter->ReadData(&payload, &payload_size))
     return false;
 
   r->SetHeaderValues(static_cast<int32>(routing_id), type, flags);
@@ -777,7 +777,7 @@ void ParamTraits<HANDLE>::Write(Message* m, const param_type& p) {
 bool ParamTraits<HANDLE>::Read(const Message* m, PickleIterator* iter,
                                param_type* r) {
   int32 temp;
-  if (!m->ReadInt(iter, &temp))
+  if (!iter->ReadInt(&temp))
     return false;
   *r = LongToHandle(temp);
   return true;
@@ -795,7 +795,7 @@ bool ParamTraits<LOGFONT>::Read(const Message* m, PickleIterator* iter,
                                 param_type* r) {
   const char *data;
   int data_size = 0;
-  if (m->ReadData(iter, &data, &data_size) && data_size == sizeof(LOGFONT)) {
+  if (iter->ReadData(&data, &data_size) && data_size == sizeof(LOGFONT)) {
     const LOGFONT *font = reinterpret_cast<LOGFONT*>(const_cast<char*>(data));
     if (_tcsnlen(font->lfFaceName, LF_FACESIZE) < LF_FACESIZE) {
       memcpy(r, data, sizeof(LOGFONT));
@@ -819,7 +819,7 @@ bool ParamTraits<MSG>::Read(const Message* m, PickleIterator* iter,
                             param_type* r) {
   const char *data;
   int data_size = 0;
-  bool result = m->ReadData(iter, &data, &data_size);
+  bool result = iter->ReadData(&data, &data_size);
   if (result && data_size == sizeof(MSG)) {
     memcpy(r, data, sizeof(MSG));
   } else {
diff --git a/ipc/ipc_message_utils.h b/ipc/ipc_message_utils.h
index d18ab61..d4c6268 100644
--- a/ipc/ipc_message_utils.h
+++ b/ipc/ipc_message_utils.h
@@ -117,7 +117,7 @@ struct ParamTraits<bool> {
     m->WriteBool(p);
   }
   static bool Read(const Message* m, PickleIterator* iter, param_type* r) {
-    return m->ReadBool(iter, r);
+    return iter->ReadBool(r);
   }
   IPC_EXPORT static void Log(const param_type& p, std::string* l);
 };
@@ -145,7 +145,7 @@ struct ParamTraits<int> {
     m->WriteInt(p);
   }
   static bool Read(const Message* m, PickleIterator* iter, param_type* r) {
-    return m->ReadInt(iter, r);
+    return iter->ReadInt(r);
   }
   IPC_EXPORT static void Log(const param_type& p, std::string* l);
 };
@@ -157,7 +157,7 @@ struct ParamTraits<unsigned int> {
     m->WriteInt(p);
   }
   static bool Read(const Message* m, PickleIterator* iter, param_type* r) {
-    return m->ReadInt(iter, reinterpret_cast<int*>(r));
+    return iter->ReadInt(reinterpret_cast<int*>(r));
   }
   IPC_EXPORT static void Log(const param_type& p, std::string* l);
 };
@@ -169,7 +169,7 @@ struct ParamTraits<long> {
     m->WriteLongUsingDangerousNonPortableLessPersistableForm(p);
   }
   static bool Read(const Message* m, PickleIterator* iter, param_type* r) {
-    return m->ReadLong(iter, r);
+    return iter->ReadLong(r);
   }
   IPC_EXPORT static void Log(const param_type& p, std::string* l);
 };
@@ -181,7 +181,7 @@ struct ParamTraits<unsigned long> {
     m->WriteLongUsingDangerousNonPortableLessPersistableForm(p);
   }
   static bool Read(const Message* m, PickleIterator* iter, param_type* r) {
-    return m->ReadLong(iter, reinterpret_cast<long*>(r));
+    return iter->ReadLong(reinterpret_cast<long*>(r));
   }
   IPC_EXPORT static void Log(const param_type& p, std::string* l);
 };
@@ -194,7 +194,7 @@ struct ParamTraits<long long> {
   }
   static bool Read(const Message* m, PickleIterator* iter,
                    param_type* r) {
-    return m->ReadInt64(iter, reinterpret_cast<int64*>(r));
+    return iter->ReadInt64(reinterpret_cast<int64*>(r));
   }
   IPC_EXPORT static void Log(const param_type& p, std::string* l);
 };
@@ -207,7 +207,7 @@ struct ParamTraits<unsigned long long> {
   }
   static bool Read(const Message* m, PickleIterator* iter,
                    param_type* r) {
-    return m->ReadInt64(iter, reinterpret_cast<int64*>(r));
+    return iter->ReadInt64(reinterpret_cast<int64*>(r));
   }
   IPC_EXPORT static void Log(const param_type& p, std::string* l);
 };
@@ -222,7 +222,7 @@ struct IPC_EXPORT ParamTraits<float> {
     m->WriteFloat(p);
   }
   static bool Read(const Message* m, PickleIterator* iter, param_type* r) {
-    return m->ReadFloat(iter, r);
+    return iter->ReadFloat(r);
   }
   static void Log(const param_type& p, std::string* l);
 };
@@ -245,7 +245,7 @@ struct ParamTraits<std::string> {
   }
   static bool Read(const Message* m, PickleIterator* iter,
                    param_type* r) {
-    return m->ReadString(iter, r);
+    return iter->ReadString(r);
   }
   IPC_EXPORT static void Log(const param_type& p, std::string* l);
 };
@@ -258,7 +258,7 @@ struct ParamTraits<std::wstring> {
   }
   static bool Read(const Message* m, PickleIterator* iter,
                    param_type* r) {
-    return m->ReadWString(iter, r);
+    return iter->ReadWString(r);
   }
   IPC_EXPORT static void Log(const param_type& p, std::string* l);
 };
@@ -274,7 +274,7 @@ struct ParamTraits<base::string16> {
   }
   static bool Read(const Message* m, PickleIterator* iter,
                    param_type* r) {
-    return m->ReadString16(iter, r);
+    return iter->ReadString16(r);
   }
   IPC_EXPORT static void Log(const param_type& p, std::string* l);
 };
@@ -316,7 +316,7 @@ struct ParamTraits<std::vector<P> > {
                    param_type* r) {
     int size;
     // ReadLength() checks for < 0 itself.
-    if (!m->ReadLength(iter, &size))
+    if (!iter->ReadLength(&size))
       return false;
     // Resizing beforehand is not safe, see BUG 1006367 for details.
     if (INT_MAX / sizeof(P) <= static_cast<size_t>(size))
@@ -349,7 +349,7 @@ struct ParamTraits<std::set<P> > {
   static bool Read(const Message* m, PickleIterator* iter,
                    param_type* r) {
     int size;
-    if (!m->ReadLength(iter, &size))
+    if (!iter->ReadLength(&size))
       return false;
     for (int i = 0; i < size; ++i) {
       P item;
@@ -651,7 +651,7 @@ struct ParamTraits<ScopedVector<P> > {
   }
   static bool Read(const Message* m, PickleIterator* iter, param_type* r) {
     int size = 0;
-    if (!m->ReadLength(iter, &size))
+    if (!iter->ReadLength(&size))
       return false;
     if (INT_MAX/sizeof(P) <= static_cast<size_t>(size))
       return false;
@@ -690,7 +690,7 @@ struct ParamTraits<base::SmallMap<NormalMap, kArraySize, EqualKey, MapInit> > {
   }
   static bool Read(const Message* m, PickleIterator* iter, param_type* r) {
     int size;
-    if (!m->ReadLength(iter, &size))
+    if (!iter->ReadLength(&size))
       return false;
     for (int i = 0; i < size; ++i) {
       K key;
diff --git a/ipc/ipc_sync_message.cc b/ipc/ipc_sync_message.cc
index 9e3acf8..fd6dc47 100644
--- a/ipc/ipc_sync_message.cc
+++ b/ipc/ipc_sync_message.cc
@@ -113,7 +113,7 @@ bool SyncMessage::ReadSyncHeader(const Message& msg, SyncHeader* header) {
   DCHECK(msg.is_sync() || msg.is_reply());
 
   PickleIterator iter(msg);
-  bool result = msg.ReadInt(&iter, &header->message_id);
+  bool result = iter.ReadInt(&header->message_id);
   if (!result) {
     NOTREACHED();
     return false;
diff --git a/ipc/param_traits_read_macros.h b/ipc/param_traits_read_macros.h
index 1656d14..683a1de 100644
--- a/ipc/param_traits_read_macros.h
+++ b/ipc/param_traits_read_macros.h
@@ -35,7 +35,7 @@
   bool ParamTraits<enum_name>:: \
       Read(const Message* m, PickleIterator* iter, param_type* p) { \
     int value; \
-    if (!m->ReadInt(iter, &value)) \
+    if (!iter->ReadInt(&value)) \
       return false; \
     if (!(validation_expression)) \
       return false; \