Separate out IPC::Message::Sender and channel::Listener into a separate class.

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 10 matching lines @@
 #include "base/command_line.h"
 #include "base/debug/debug_on_start_win.h"
 #include "base/perftimer.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_sender.h"
 #include "ipc/ipc_switches.h"
 #include "testing/multiprocess_func_list.h"
 
 // Define to enable IPC performance testing instead of the regular unit tests
 // #define PERFORMANCE_TEST
 
 const char kTestClientChannel[] = "T1";
 const char kReflectorChannel[] = "T2";
 const char kFuzzerChannel[] = "F3";
 const char kSyncSocketChannel[] = "S4";
@@ skipping 113 matching lines @@
 
   EXPECT_TRUE(m.ReadWString(&iter, &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));
 }
 
-static void Send(IPC::Message::Sender* sender, const char* text) {
+static void Send(IPC::Sender* sender, const char* text) {
   static int message_index = 0;
 
   IPC::Message* message = new IPC::Message(0,
                                            2,
                                            IPC::Message::PRIORITY_NORMAL);
   message->WriteInt(message_index++);
   message->WriteString(std::string(text));
 
   // Make sure we can handle large messages.
   char junk[kLongMessageStringNumBytes];
@@ skipping 23 matching lines @@
     }
     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) {
+  void Init(IPC::Sender* s) {
     sender_ = s;
     messages_left_ = 50;
   }
 
  private:
-  IPC::Message::Sender* sender_;
+  IPC::Sender* sender_;
   int messages_left_;
 };
 
 TEST_F(IPCChannelTest, ChannelTest) {
   MyChannelListener channel_listener;
   // Setup IPC channel.
   IPC::Channel chan(kTestClientChannel, IPC::Channel::MODE_SERVER,
                     &channel_listener);
   ASSERT_TRUE(chan.Connect());
 
@@ skipping 118 matching lines @@
     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();
   }
 
-  void Init(IPC::Message::Sender* s) {
+  void Init(IPC::Sender* s) {
     sender_ = s;
     messages_left_ = 50;
   }
 
  private:
   void SendNextMessage() {
     if (--messages_left_ == 0) {
       MessageLoop::current()->Quit();
     } else {
       Send(sender_, "Foo");
     }
   }
 
-  IPC::Message::Sender* sender_;
+  IPC::Sender* sender_;
   int messages_left_;
 };
 
 #if defined(OS_WIN)
 // Acting flakey in Windows. http://crbug.com/129595
 #define MAYBE_SendMessageInChannelConnected DISABLED_SendMessageInChannelConnected
 #else
 #define MAYBE_SendMessageInChannelConnected SendMessageInChannelConnected
 #endif
 TEST_F(IPCChannelTest, MAYBE_SendMessageInChannelConnected) {
@@ skipping 207 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;
 }