Support generic synchronization against an IPC::Channel

ipc/ipc_test_base.h

 // Copyright (c) 2011 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.
 
 #ifndef IPC_IPC_TEST_BASE_H_
 #define IPC_IPC_TEST_BASE_H_
 
 #include <memory>
 #include <string>
 
@@ skipping 119 matching lines @@
   std::unique_ptr<IPC::Channel> channel_;
   std::unique_ptr<IPC::ChannelProxy> channel_proxy_;
 
   base::Process client_process_;
 
   DISALLOW_COPY_AND_ASSIGN(IPCTestBase);
 };
 
 class IPCChannelMojoTestBase : public testing::Test {
  public:
+  class ClientHandle {
+   public:
+    ClientHandle();
+    ~ClientHandle();
+
+    void Init(const std::string& test_client_name);
+    void CreateChannel(IPC::Listener* listener);
+    bool ConnectChannel();
+    void DestroyChannel();
+    bool WaitForShutdown();
+
+    mojo::ScopedMessagePipeHandle TakeHandle();
+
+    IPC::Channel* channel() { return channel_.get(); }
+    const base::Process& process() const { return helper_.test_child(); }
+
+   private:
+    mojo::ScopedMessagePipeHandle pipe_;
+    mojo::edk::test::MultiprocessTestHelper helper_;
+    std::unique_ptr<IPC::Channel> channel_;
+
+    DISALLOW_COPY_AND_ASSIGN(ClientHandle);
+  };
+
   IPCChannelMojoTestBase();
   ~IPCChannelMojoTestBase() override;
 
   void Init(const std::string& test_client_name);
 
   bool WaitForClientShutdown();
 
   void TearDown() override;
 
   void CreateChannel(IPC::Listener* listener);
 
   bool ConnectChannel();
 
   void DestroyChannel();
 
   IPC::Sender* sender() { return channel(); }
-  IPC::Channel* channel() { return channel_.get(); }
-  const base::Process& client_process() const { return helper_.test_child(); }
+  IPC::Channel* channel() { return primary_client_.channel(); }
+  const base::Process& client_process() const {
+    return primary_client_.process();
+  }
 
  protected:
   mojo::ScopedMessagePipeHandle TakeHandle();
 
  private:
   base::MessageLoop message_loop_;
-
-  mojo::ScopedMessagePipeHandle handle_;
-  mojo::edk::test::MultiprocessTestHelper helper_;
-
-  std::unique_ptr<IPC::Channel> channel_;
+  ClientHandle primary_client_;
 
   DISALLOW_COPY_AND_ASSIGN(IPCChannelMojoTestBase);
 };
 
 class IpcChannelMojoTestClient {
  public:
   IpcChannelMojoTestClient();
   ~IpcChannelMojoTestClient();
 
   void Init(mojo::ScopedMessagePipeHandle handle);
@@ skipping 36 matching lines @@
                : 0;                                                           \
   }                                                                           \
   void client_name##_MainFixture::Main()
 
 // Use this to declare the client side for tests using IPCChannelMojoTestBase.
 #define DEFINE_IPC_CHANNEL_MOJO_TEST_CLIENT(client_name)   \
   DEFINE_IPC_CHANNEL_MOJO_TEST_CLIENT_WITH_CUSTOM_FIXTURE( \
       client_name, IpcChannelMojoTestClient)
 
 #endif  // IPC_IPC_TEST_BASE_H_