EDK: mostly style fix: change TestIOThread::Mode to an enum class. R=vardhan@google.com Review URL: https://codereview.chromium.org/1367523003 .
diff --git a/mojo/edk/embedder/embedder_unittest.cc b/mojo/edk/embedder/embedder_unittest.cc index ef231ce..20e4664 100644 --- a/mojo/edk/embedder/embedder_unittest.cc +++ b/mojo/edk/embedder/embedder_unittest.cc
@@ -131,7 +131,7 @@ class EmbedderTest : public testing::Test { public: - EmbedderTest() : test_io_thread_(TestIOThread::kAutoStart) {} + EmbedderTest() : test_io_thread_(TestIOThread::StartMode::AUTO) {} ~EmbedderTest() override {} protected: @@ -477,7 +477,7 @@ mojo::test::MultiprocessTestHelper::client_platform_handle.Pass(); EXPECT_TRUE(client_platform_handle.is_valid()); - TestIOThread test_io_thread(TestIOThread::kAutoStart); + TestIOThread test_io_thread(TestIOThread::StartMode::AUTO); test::InitWithSimplePlatformSupport(); { @@ -672,7 +672,7 @@ mojo::test::MultiprocessTestHelper::client_platform_handle.Pass(); EXPECT_TRUE(client_platform_handle.is_valid()); - TestIOThread test_io_thread(TestIOThread::kAutoStart); + TestIOThread test_io_thread(TestIOThread::StartMode::AUTO); test::InitWithSimplePlatformSupport(); {
diff --git a/mojo/edk/system/channel_test_base.cc b/mojo/edk/system/channel_test_base.cc index df90d3a..1d9a7cd 100644 --- a/mojo/edk/system/channel_test_base.cc +++ b/mojo/edk/system/channel_test_base.cc
@@ -16,7 +16,7 @@ namespace test { ChannelTestBase::ChannelTestBase() - : io_thread_(mojo::test::TestIOThread::kAutoStart) {} + : io_thread_(mojo::test::TestIOThread::StartMode::AUTO) {} ChannelTestBase::~ChannelTestBase() { }
diff --git a/mojo/edk/system/data_pipe_impl_unittest.cc b/mojo/edk/system/data_pipe_impl_unittest.cc index 3b19c5b..b7309c4 100644 --- a/mojo/edk/system/data_pipe_impl_unittest.cc +++ b/mojo/edk/system/data_pipe_impl_unittest.cc
@@ -224,7 +224,7 @@ class RemoteDataPipeImplTestHelper : public DataPipeImplTestHelper { public: RemoteDataPipeImplTestHelper() - : io_thread_(mojo::test::TestIOThread::kAutoStart) {} + : io_thread_(mojo::test::TestIOThread::StartMode::AUTO) {} ~RemoteDataPipeImplTestHelper() override {} void SetUp() override {
diff --git a/mojo/edk/system/ipc_support_unittest.cc b/mojo/edk/system/ipc_support_unittest.cc index cb45eb3..11800d4 100644 --- a/mojo/edk/system/ipc_support_unittest.cc +++ b/mojo/edk/system/ipc_support_unittest.cc
@@ -372,7 +372,7 @@ public: // Note: Run master process delegate methods on the I/O thread. IPCSupportTest() - : test_io_thread_(TestIOThread::kAutoStart), + : test_io_thread_(TestIOThread::StartMode::AUTO), master_ipc_support_(&platform_support_, embedder::ProcessType::MASTER, test_io_thread_.task_runner(), @@ -686,7 +686,7 @@ ASSERT_TRUE(client_platform_handle.is_valid()); embedder::SimplePlatformSupport platform_support; - TestIOThread test_io_thread(TestIOThread::kAutoStart); + TestIOThread test_io_thread(TestIOThread::StartMode::AUTO); TestSlaveProcessDelegate slave_process_delegate; // Note: Run process delegate methods on the I/O thread. IPCSupport ipc_support(&platform_support, embedder::ProcessType::SLAVE,
diff --git a/mojo/edk/system/message_pipe_test_utils.cc b/mojo/edk/system/message_pipe_test_utils.cc index 8591c5a..ef53862 100644 --- a/mojo/edk/system/message_pipe_test_utils.cc +++ b/mojo/edk/system/message_pipe_test_utils.cc
@@ -35,7 +35,7 @@ ChannelThread::ChannelThread(embedder::PlatformSupport* platform_support) : platform_support_(platform_support), - test_io_thread_(mojo::test::TestIOThread::kManualStart) {} + test_io_thread_(mojo::test::TestIOThread::StartMode::MANUAL) {} ChannelThread::~ChannelThread() { Stop();
diff --git a/mojo/edk/system/raw_channel_unittest.cc b/mojo/edk/system/raw_channel_unittest.cc index 3921281..9089a6e 100644 --- a/mojo/edk/system/raw_channel_unittest.cc +++ b/mojo/edk/system/raw_channel_unittest.cc
@@ -73,7 +73,7 @@ class RawChannelTest : public testing::Test { public: - RawChannelTest() : io_thread_(mojo::test::TestIOThread::kManualStart) {} + RawChannelTest() : io_thread_(mojo::test::TestIOThread::StartMode::MANUAL) {} ~RawChannelTest() override {} void SetUp() override {
diff --git a/mojo/edk/system/remote_data_pipe_impl_unittest.cc b/mojo/edk/system/remote_data_pipe_impl_unittest.cc index bb03b07..6464564 100644 --- a/mojo/edk/system/remote_data_pipe_impl_unittest.cc +++ b/mojo/edk/system/remote_data_pipe_impl_unittest.cc
@@ -37,7 +37,8 @@ class RemoteDataPipeImplTest : public testing::Test { public: - RemoteDataPipeImplTest() : io_thread_(mojo::test::TestIOThread::kAutoStart) {} + RemoteDataPipeImplTest() + : io_thread_(mojo::test::TestIOThread::StartMode::AUTO) {} ~RemoteDataPipeImplTest() override {} void SetUp() override {
diff --git a/mojo/edk/system/remote_message_pipe_unittest.cc b/mojo/edk/system/remote_message_pipe_unittest.cc index 530d6c5..81a52cb 100644 --- a/mojo/edk/system/remote_message_pipe_unittest.cc +++ b/mojo/edk/system/remote_message_pipe_unittest.cc
@@ -45,7 +45,8 @@ class RemoteMessagePipeTest : public testing::Test { public: - RemoteMessagePipeTest() : io_thread_(mojo::test::TestIOThread::kAutoStart) {} + RemoteMessagePipeTest() + : io_thread_(mojo::test::TestIOThread::StartMode::AUTO) {} ~RemoteMessagePipeTest() override {} void SetUp() override {
diff --git a/mojo/edk/test/test_io_thread.cc b/mojo/edk/test/test_io_thread.cc index b5b9042..e7bcac1 100644 --- a/mojo/edk/test/test_io_thread.cc +++ b/mojo/edk/test/test_io_thread.cc
@@ -21,13 +21,13 @@ } // namespace -TestIOThread::TestIOThread(Mode mode) +TestIOThread::TestIOThread(StartMode start_mode) : io_thread_("test_io_thread"), io_thread_started_(false) { - switch (mode) { - case kAutoStart: + switch (start_mode) { + case StartMode::AUTO: Start(); return; - case kManualStart: + case StartMode::MANUAL: return; } CHECK(false) << "Invalid mode";
diff --git a/mojo/edk/test/test_io_thread.h b/mojo/edk/test/test_io_thread.h index 78b0b01..0b0f5dd 100644 --- a/mojo/edk/test/test_io_thread.h +++ b/mojo/edk/test/test_io_thread.h
@@ -17,8 +17,8 @@ // Class to help create/run threads with I/O |MessageLoop|s in tests. class TestIOThread { public: - enum Mode { kAutoStart, kManualStart }; - explicit TestIOThread(Mode mode); + enum class StartMode { AUTO, MANUAL }; + explicit TestIOThread(StartMode start_mode); // Stops the I/O thread if necessary. ~TestIOThread();