Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(114)

Unified Diff: mojo/system/channel_unittest.cc

Issue 597413002: Mojo: NULL -> nullptr in mojo/system and mojo/embedder. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: EXPECT_TRUE Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/system/channel_endpoint.cc ('k') | mojo/system/core.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/system/channel_unittest.cc
diff --git a/mojo/system/channel_unittest.cc b/mojo/system/channel_unittest.cc
index e7100968ca432820fe57481f5603124dc5ada0b0..17e9548513fb4bf6db1f99f19bfcc51f858fc542 100644
--- a/mojo/system/channel_unittest.cc
+++ b/mojo/system/channel_unittest.cc
@@ -110,7 +110,7 @@ TEST_F(ChannelTest, InitShutdown) {
// Okay to destroy |Channel| on not-the-I/O-thread.
EXPECT_TRUE(channel()->HasOneRef());
- *mutable_channel() = NULL;
+ *mutable_channel() = nullptr;
}
// ChannelTest.InitFails -------------------------------------------------------
@@ -178,7 +178,7 @@ TEST_F(ChannelTest, InitFails) {
// Should destroy |Channel| with no |Shutdown()| (on not-the-I/O-thread).
EXPECT_TRUE(channel()->HasOneRef());
- *mutable_channel() = NULL;
+ *mutable_channel() = nullptr;
}
// ChannelTest.CloseBeforeRun --------------------------------------------------
@@ -252,8 +252,9 @@ TEST_F(ChannelTest, ShutdownAfterAttach) {
Waiter waiter;
waiter.Init();
- ASSERT_EQ(MOJO_RESULT_OK,
- mp->AddWaiter(0, &waiter, MOJO_HANDLE_SIGNAL_READABLE, 123, NULL));
+ ASSERT_EQ(
+ MOJO_RESULT_OK,
+ mp->AddWaiter(0, &waiter, MOJO_HANDLE_SIGNAL_READABLE, 123, nullptr));
// Don't wait for the shutdown to run ...
io_thread()->PostTask(FROM_HERE,
@@ -262,7 +263,7 @@ TEST_F(ChannelTest, ShutdownAfterAttach) {
// ... since this |Wait()| should fail once the channel is shut down.
EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION,
- waiter.Wait(MOJO_DEADLINE_INDEFINITE, NULL));
+ waiter.Wait(MOJO_DEADLINE_INDEFINITE, nullptr));
HandleSignalsState hss;
mp->RemoveWaiter(0, &waiter, &hss);
EXPECT_EQ(0u, hss.satisfied_signals);
« no previous file with comments | « mojo/system/channel_endpoint.cc ('k') | mojo/system/core.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698