Remove Message::Sender and Channel::Listener typedefs.

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>
@@ skipping 164 matching lines @@
   // Make sure we can handle large messages.
   char junk[kLongMessageStringNumBytes];
   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 {
+class MyChannelListener : public IPC::Listener {
  public:
   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());
 
 
@@ skipping 126 matching lines @@
     // run message loop
     MessageLoop::current()->Run();
 
     // cleanup child process
     EXPECT_TRUE(base::WaitForSingleProcess(process_handle, 5000));
     base::CloseProcessHandle(process_handle);
   }
   thread.Stop();
 }
 
-class ChannelListenerWithOnConnectedSend : public IPC::Channel::Listener {
+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);
 
     iter.NextInt();
     const std::string data = iter.NextString();
@@ skipping 89 matching lines @@
 //    regular unit tests.
 //
 //    This test is not automated. To test, you will want to vary the message
 //    count and message size in TEST to get the numbers you want.
 //
 //    FIXME(brettw): Automate this test and have it run by default.
 
 // This channel listener just replies to all messages with the exact same
 // message. It assumes each message has one string parameter. When the string
 // "quit" is sent, it will exit.
-class ChannelReflectorListener : public IPC::Channel::Listener {
+class ChannelReflectorListener : public IPC::Listener {
  public:
   explicit ChannelReflectorListener(IPC::Channel *channel) :
     channel_(channel),
     count_messages_(0),
     latency_messages_(0) {
     std::cout << "Reflector up" << std::endl;
   }
 
   ~ChannelReflectorListener() {
     std::cout << "Client Messages: " << count_messages_ << std::endl;
@@ skipping 21 matching lines @@
     channel_->Send(msg);
     return true;
   }
 
  private:
   IPC::Channel *channel_;
   int count_messages_;
   int latency_messages_;
 };
 
-class ChannelPerfListener : public IPC::Channel::Listener {
+class ChannelPerfListener : public IPC::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;
@@ skipping 92 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;
 }