Remove IPC::MessageIterator.

ipc/ipc_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 "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #elif defined(OS_POSIX)
 #include <sys/types.h>
 #include <unistd.h>
 #endif
 
 #include <stdio.h>
 #include <string>
 #include <utility>
 
 #include "ipc/ipc_tests.h"
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/debug/debug_on_start_win.h"
 #include "base/perftimer.h"
+#include "base/pickle.h"
 #include "base/test/perf_test_suite.h"
 #include "base/test/test_suite.h"
 #include "base/threading/thread.h"
 #include "ipc/ipc_descriptors.h"
 #include "ipc/ipc_channel.h"
 #include "ipc/ipc_channel_proxy.h"
 #include "ipc/ipc_message_utils.h"
 #include "ipc/ipc_multiprocess_test.h"
 #include "ipc/ipc_sender.h"
 #include "ipc/ipc_switches.h"
@@ skipping 144 matching lines @@
   junk[sizeof(junk)-1] = 0;
   message->WriteString(std::string(junk));
 
   // DEBUG: printf("[%u] sending message [%s]\n", GetCurrentProcessId(), text);
   sender->Send(message);
 }
 
 class MyChannelListener : public IPC::Listener {
  public:
   virtual bool OnMessageReceived(const IPC::Message& message) {
-    IPC::MessageIterator iter(message);
+    PickleIterator iter(message);
 
-    iter.NextInt();
-    const std::string data = iter.NextString();
-    const std::string big_string = iter.NextString();
+    int ignored;
+    EXPECT_TRUE(iter.ReadInt(&ignored));
+    std::string data;
+    EXPECT_TRUE(iter.ReadString(&data));
+    std::string big_string;
+    EXPECT_TRUE(iter.ReadString(&big_string));
     EXPECT_EQ(kLongMessageStringNumBytes - 1, big_string.length());
 
 
     if (--messages_left_ == 0) {
       MessageLoop::current()->Quit();
     } else {
       Send(sender_, "Foo");
     }
     return true;
   }
@@ skipping 129 matching lines @@
   thread.Stop();
 }
 
 class ChannelListenerWithOnConnectedSend : public IPC::Listener {
  public:
   virtual void OnChannelConnected(int32 peer_pid) OVERRIDE {
     SendNextMessage();
   }
 
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE {
-    IPC::MessageIterator iter(message);
+    PickleIterator iter(message);
 
-    iter.NextInt();
-    const std::string data = iter.NextString();
-    const std::string big_string = iter.NextString();
+    int ignored;
+    EXPECT_TRUE(iter.ReadInt(&ignored));
+    std::string data;
+    EXPECT_TRUE(iter.ReadString(&data));
+    std::string big_string;
+    EXPECT_TRUE(iter.ReadString(&big_string));
     EXPECT_EQ(kLongMessageStringNumBytes - 1, big_string.length());
     SendNextMessage();
     return true;
   }
 
   virtual void OnChannelError() OVERRIDE {
     // There is a race when closing the channel so the last message may be lost.
     EXPECT_LE(messages_left_, 1);
     MessageLoop::current()->Quit();
   }
@@ skipping 95 matching lines @@
     std::cout << "Reflector up" << std::endl;
   }
 
   ~ChannelReflectorListener() {
     std::cout << "Client Messages: " << count_messages_ << std::endl;
     std::cout << "Client Latency: " << latency_messages_ << std::endl;
   }
 
   virtual bool OnMessageReceived(const IPC::Message& message) {
     count_messages_++;
-    IPC::MessageIterator iter(message);
-    int time = iter.NextInt();
-    int msgid = iter.NextInt();
+    PickleIterator iter(message);
+    int time;
+    EXPECT_TRUE(iter.ReadInt(&time));
+    int msgid;
+    EXPECT_TRUE(iter.ReadInt(&msgid));
     std::string payload = iter.NextString();
     latency_messages_ += GetTickCount() - time;
 
     // cout << "reflector msg received: " << msgid << endl;
     if (payload == "quit")
       MessageLoop::current()->Quit();
 
     IPC::Message* msg = new IPC::Message(0,
                                          2,
                                          IPC::Message::PRIORITY_NORMAL);
@@ skipping 23 matching lines @@
     std::cout << "perflistener up" << std::endl;
   }
 
   ~ChannelPerfListener() {
     std::cout << "Server Messages: " << count_messages_ << std::endl;
     std::cout << "Server Latency: " << latency_messages_ << std::endl;
   }
 
   virtual bool OnMessageReceived(const IPC::Message& message) {
     count_messages_++;
-    // decode the string so this gets counted in the total time
-    IPC::MessageIterator iter(message);
-    int time = iter.NextInt();
-    int msgid = iter.NextInt();
+    // Decode the string so this gets counted in the total time.
+    PickleIterator iter(message);
+    int time;
+    EXPECT_TRUE(iter.ReadInt(&time));
+    int msgid;
+    EXPECT_TRUE(iter.ReadInt(&msgid));
     std::string cur = iter.NextString();
     latency_messages_ += GetTickCount() - time;
 
-    // cout << "perflistener got message" << endl;
-
     count_down_--;
     if (count_down_ == 0) {
       IPC::Message* msg = new IPC::Message(0,
                                            2,
                                            IPC::Message::PRIORITY_NORMAL);
       msg->WriteInt(GetTickCount());
       msg->WriteInt(count_down_);
       msg->WriteString("quit");
       channel_->Send(msg);
       SetTimer(NULL, 1, 250, (TIMERPROC) PostQuitMessage);
@@ skipping 64 matching lines @@
 #endif  // PERFORMANCE_TEST
 
 int main(int argc, char** argv) {
 #ifdef PERFORMANCE_TEST
   int retval = base::PerfTestSuite(argc, argv).Run();
 #else
   int retval = base::TestSuite(argc, argv).Run();
 #endif
   return retval;
 }