Make IPC::Channel::Listener:OnMessageReceived have a return value indicating ...

ipc/ipc_tests.cc

 // Copyright (c) 2010 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>
@@ skipping 164 matching lines @@
   memset(junk, 'a', sizeof(junk)-1);
   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::Channel::Listener {
  public:
-  virtual void OnMessageReceived(const IPC::Message& message) {
+  virtual bool OnMessageReceived(const IPC::Message& message) {
     IPC::MessageIterator iter(message);
 
     iter.NextInt();
     const std::string data = iter.NextString();
     const std::string big_string = iter.NextString();
     EXPECT_EQ(kLongMessageStringNumBytes - 1, big_string.length());
 
 
     if (--messages_left_ == 0) {
       MessageLoop::current()->Quit();
     } else {
       Send(sender_, "Foo");
     }
+    return true;
   }
 
   virtual void OnChannelError() {
     // There is a race when closing the channel so the last message may be lost.
     EXPECT_LE(messages_left_, 1);
     MessageLoop::current()->Quit();
   }
 
   void Init(IPC::Message::Sender* s) {
     sender_ = s;
@@ skipping 75 matching lines @@
   }
   thread.Stop();
 }
 
 class ChannelListenerWithOnConnectedSend : public IPC::Channel::Listener {
  public:
   virtual void OnChannelConnected(int32 peer_pid) {
     SendNextMessage();
   }
 
-  virtual void OnMessageReceived(const IPC::Message& message) {
+  virtual bool OnMessageReceived(const IPC::Message& message) {
     IPC::MessageIterator iter(message);
 
     iter.NextInt();
     const std::string data = iter.NextString();
     const std::string big_string = iter.NextString();
     EXPECT_EQ(kLongMessageStringNumBytes - 1, big_string.length());
     SendNextMessage();
+    return true;
   }
 
   virtual void OnChannelError() {
     // There is a race when closing the channel so the last message may be lost.
     EXPECT_LE(messages_left_, 1);
     MessageLoop::current()->Quit();
   }
 
   void Init(IPC::Message::Sender* s) {
     sender_ = s;
@@ skipping 83 matching lines @@
     count_messages_(0),
     latency_messages_(0) {
     std::cout << "Reflector up" << std::endl;
   }
 
   ~ChannelReflectorListener() {
     std::cout << "Client Messages: " << count_messages_ << std::endl;
     std::cout << "Client Latency: " << latency_messages_ << std::endl;
   }
 
-  virtual void OnMessageReceived(const IPC::Message& message) {
+  virtual bool OnMessageReceived(const IPC::Message& message) {
     count_messages_++;
     IPC::MessageIterator iter(message);
     int time = iter.NextInt();
     int msgid = iter.NextInt();
     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);
     msg->WriteInt(GetTickCount());
     msg->WriteInt(msgid);
     msg->WriteString(payload);
     channel_->Send(msg);
+    return true;
   }
  private:
   IPC::Channel *channel_;
   int count_messages_;
   int latency_messages_;
 };
 
 class ChannelPerfListener : public IPC::Channel::Listener {
  public:
   ChannelPerfListener(IPC::Channel* channel, int msg_count, int msg_size) :
        count_down_(msg_count),
        channel_(channel),
        count_messages_(0),
        latency_messages_(0) {
     payload_.resize(msg_size);
     for (int i = 0; i < static_cast<int>(payload_.size()); i++)
       payload_[i] = 'a';
     std::cout << "perflistener up" << std::endl;
   }
 
   ~ChannelPerfListener() {
     std::cout << "Server Messages: " << count_messages_ << std::endl;
     std::cout << "Server Latency: " << latency_messages_ << std::endl;
   }
 
-  virtual void OnMessageReceived(const IPC::Message& message) {
+  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();
     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);
-      return;
+      return true;
     }
 
     IPC::Message* msg = new IPC::Message(0,
                                          2,
                                          IPC::Message::PRIORITY_NORMAL);
     msg->WriteInt(GetTickCount());
     msg->WriteInt(count_down_);
     msg->WriteString(payload_);
     channel_->Send(msg);
+    return true;
   }
 
  private:
   int count_down_;
   std::string payload_;
   IPC::Channel *channel_;
   int count_messages_;
   int latency_messages_;
 };
 
@@ skipping 43 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;
 }