Revert of Change most IPC tests to use ChannelMojo.

ipc/sync_socket_unittest.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 "base/sync_socket.h"
 
 #include <stddef.h>
 #include <stdio.h>
 #include <memory>
 #include <sstream>
@@ skipping 91 matching lines @@
   // which causes the message loop to exit.
   void OnMsgClassShutdown() { base::MessageLoop::current()->QuitWhenIdle(); }
 
   IPC::Channel* chan_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncSocketServerListener);
 };
 
 // Runs the fuzzing server child mode. Returns when the preset number of
 // messages have been received.
-DEFINE_IPC_CHANNEL_MOJO_TEST_CLIENT(SyncSocketServerClient) {
+MULTIPROCESS_IPC_TEST_CLIENT_MAIN(SyncSocketServerClient) {
+  base::MessageLoopForIO main_message_loop;
   SyncSocketServerListener listener;
-  Connect(&listener);
-  listener.Init(channel());
+  std::unique_ptr<IPC::Channel> channel(IPC::Channel::CreateClient(
+      IPCTestBase::GetChannelName("SyncSocketServerClient"), &listener,
+      main_message_loop.task_runner()));
+  EXPECT_TRUE(channel->Connect());
+  listener.Init(channel.get());
   base::RunLoop().Run();
-  Close();
+  return 0;
 }
 
 // The SyncSocket client listener only processes one sort of message,
 // a response from the server.
 class SyncSocketClientListener : public IPC::Listener {
  public:
   SyncSocketClientListener() {
   }
 
   void Init(base::SyncSocket* socket, IPC::Channel* chan) {
@@ skipping 27 matching lines @@
     EXPECT_TRUE(chan_->Send(msg));
     base::MessageLoop::current()->QuitWhenIdle();
   }
 
   base::SyncSocket* socket_;
   IPC::Channel* chan_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncSocketClientListener);
 };
 
-using SyncSocketTest = IPCChannelMojoTestBase;
+class SyncSocketTest : public IPCTestBase {
+};
 
 TEST_F(SyncSocketTest, SanityTest) {
   Init("SyncSocketServerClient");
 
   SyncSocketClientListener listener;
   CreateChannel(&listener);
+  ASSERT_TRUE(StartClient());
   // Create a pair of SyncSockets.
   base::SyncSocket pair[2];
   base::SyncSocket::CreatePair(&pair[0], &pair[1]);
   // Immediately after creation there should be no pending bytes.
   EXPECT_EQ(0U, pair[0].Peek());
   EXPECT_EQ(0U, pair[1].Peek());
   base::SyncSocket::Handle target_handle;
   // Connect the channel and listener.
   ASSERT_TRUE(ConnectChannel());
   listener.Init(&pair[0], channel());
@@ skipping 116 matching lines @@
 
   // Read from another socket to free some space for a new write.
   char hello[kHelloStringLength] = {0};
   pair[1].Receive(&hello[0], sizeof(hello));
 
   // Should be able to write more data to the buffer now.
   EXPECT_EQ(kHelloStringLength, pair[0].Send(kHelloString, kHelloStringLength));
 }
 
 }  // namespace