Index: mojo/edk/system/message_pipe_test_utils.h |
diff --git a/third_party/mojo/src/mojo/edk/system/message_pipe_test_utils.h b/mojo/edk/system/message_pipe_test_utils.h |
similarity index 58% |
copy from third_party/mojo/src/mojo/edk/system/message_pipe_test_utils.h |
copy to mojo/edk/system/message_pipe_test_utils.h |
index 3e8e0050a2ad808dccbf7ab73a05cf5b02d42e64..b4788b59d0d7dce512823d42a0020b04f90a8a32 100644 |
--- a/third_party/mojo/src/mojo/edk/system/message_pipe_test_utils.h |
+++ b/mojo/edk/system/message_pipe_test_utils.h |
@@ -5,62 +5,39 @@ |
#ifndef MOJO_EDK_SYSTEM_MESSAGE_PIPE_TEST_UTILS_H_ |
#define MOJO_EDK_SYSTEM_MESSAGE_PIPE_TEST_UTILS_H_ |
+#include "base/message_loop/message_loop.h" |
#include "base/test/test_io_thread.h" |
#include "mojo/edk/embedder/simple_platform_support.h" |
-#include "mojo/edk/system/channel.h" |
#include "mojo/edk/system/test_utils.h" |
#include "mojo/edk/test/multiprocess_test_helper.h" |
+#include "mojo/edk/test/scoped_ipc_support.h" |
#include "mojo/public/cpp/system/macros.h" |
namespace mojo { |
namespace system { |
-class Channel; |
class ChannelEndpoint; |
class MessagePipe; |
namespace test { |
-MojoResult WaitIfNecessary(scoped_refptr<MessagePipe> mp, |
- MojoHandleSignals signals, |
- HandleSignalsState* signals_state); |
- |
-class ChannelThread { |
- public: |
- explicit ChannelThread(embedder::PlatformSupport* platform_support); |
- ~ChannelThread(); |
- |
- void Start(embedder::ScopedPlatformHandle platform_handle, |
- scoped_refptr<ChannelEndpoint> channel_endpoint); |
- void Stop(); |
- |
- private: |
- void InitChannelOnIOThread(embedder::ScopedPlatformHandle platform_handle, |
- scoped_refptr<ChannelEndpoint> channel_endpoint); |
- void ShutdownChannelOnIOThread(); |
- |
- embedder::PlatformSupport* const platform_support_; |
- base::TestIOThread test_io_thread_; |
- scoped_refptr<Channel> channel_; |
- |
- MOJO_DISALLOW_COPY_AND_ASSIGN(ChannelThread); |
-}; |
- |
#if !defined(OS_IOS) |
class MultiprocessMessagePipeTestBase : public testing::Test { |
public: |
MultiprocessMessagePipeTestBase(); |
+ MultiprocessMessagePipeTestBase( |
+ base::MessageLoop::Type main_message_loop_type); |
~MultiprocessMessagePipeTestBase() override; |
protected: |
- void Init(scoped_refptr<ChannelEndpoint> ep); |
- |
embedder::PlatformSupport* platform_support() { return &platform_support_; } |
mojo::test::MultiprocessTestHelper* helper() { return &helper_; } |
private: |
embedder::SimplePlatformSupport platform_support_; |
- ChannelThread channel_thread_; |
+ base::MessageLoop message_loop_; |
+ base::TestIOThread test_io_thread_; |
+ mojo::test::ScopedIPCSupport ipc_support_; |
mojo::test::MultiprocessTestHelper helper_; |
MOJO_DISALLOW_COPY_AND_ASSIGN(MultiprocessMessagePipeTestBase); |