Index: mojo/edk/system/channel_unittest.cc |
diff --git a/mojo/edk/system/channel_unittest.cc b/mojo/edk/system/channel_unittest.cc |
index e84ab5bea03debcaca41692105ae85ce35d6f4ca..ce4eefe4b28d80eccd7811ac94ac8fffe3fbba5e 100644 |
--- a/mojo/edk/system/channel_unittest.cc |
+++ b/mojo/edk/system/channel_unittest.cc |
@@ -50,7 +50,7 @@ class ChannelTest : public testing::Test { |
CHECK_EQ(base::MessageLoop::current(), io_thread()->message_loop()); |
CHECK(raw_channel_); |
- CHECK(channel_.get()); |
+ CHECK(channel_); |
CHECK_EQ(init_result_, TRISTATE_UNKNOWN); |
init_result_ = BoolToTristate(channel_->Init(raw_channel_.Pass())); |
@@ -59,7 +59,7 @@ class ChannelTest : public testing::Test { |
void ShutdownChannelOnIOThread() { |
CHECK_EQ(base::MessageLoop::current(), io_thread()->message_loop()); |
- CHECK(channel_.get()); |
+ CHECK(channel_); |
channel_->Shutdown(); |
} |
@@ -231,7 +231,7 @@ TEST_F(ChannelTest, ShutdownAfterAttach) { |
waiter.Init(); |
ASSERT_EQ( |
MOJO_RESULT_OK, |
- mp->AddWaiter(0, &waiter, MOJO_HANDLE_SIGNAL_READABLE, 123, nullptr)); |
+ mp->AddAwakable(0, &waiter, MOJO_HANDLE_SIGNAL_READABLE, 123, nullptr)); |
// Don't wait for the shutdown to run ... |
io_thread()->PostTask(FROM_HERE, |
@@ -242,7 +242,7 @@ TEST_F(ChannelTest, ShutdownAfterAttach) { |
EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION, |
waiter.Wait(MOJO_DEADLINE_INDEFINITE, nullptr)); |
HandleSignalsState hss; |
- mp->RemoveWaiter(0, &waiter, &hss); |
+ mp->RemoveAwakable(0, &waiter, &hss); |
EXPECT_EQ(MOJO_HANDLE_SIGNAL_PEER_CLOSED, hss.satisfied_signals); |
EXPECT_EQ(MOJO_HANDLE_SIGNAL_PEER_CLOSED, hss.satisfiable_signals); |
@@ -277,8 +277,9 @@ TEST_F(ChannelTest, WaitAfterAttachRunAndShutdown) { |
Waiter waiter; |
waiter.Init(); |
HandleSignalsState hss; |
- EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION, |
- mp->AddWaiter(0, &waiter, MOJO_HANDLE_SIGNAL_READABLE, 123, &hss)); |
+ EXPECT_EQ( |
+ MOJO_RESULT_FAILED_PRECONDITION, |
+ mp->AddAwakable(0, &waiter, MOJO_HANDLE_SIGNAL_READABLE, 123, &hss)); |
EXPECT_EQ(MOJO_HANDLE_SIGNAL_PEER_CLOSED, hss.satisfied_signals); |
EXPECT_EQ(MOJO_HANDLE_SIGNAL_PEER_CLOSED, hss.satisfiable_signals); |