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

Side by Side Diff: mojo/system/message_pipe_test_utils.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 unified diff | Download patch
« no previous file with comments | « mojo/system/message_pipe_perftest.cc ('k') | mojo/system/message_pipe_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "mojo/system/message_pipe_test_utils.h" 5 #include "mojo/system/message_pipe_test_utils.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/threading/platform_thread.h" // For |Sleep()|. 8 #include "base/threading/platform_thread.h" // For |Sleep()|.
9 #include "mojo/system/channel.h" 9 #include "mojo/system/channel.h"
10 #include "mojo/system/channel_endpoint.h" 10 #include "mojo/system/channel_endpoint.h"
11 #include "mojo/system/message_pipe.h" 11 #include "mojo/system/message_pipe.h"
12 #include "mojo/system/waiter.h" 12 #include "mojo/system/waiter.h"
13 13
14 namespace mojo { 14 namespace mojo {
15 namespace system { 15 namespace system {
16 namespace test { 16 namespace test {
17 17
18 MojoResult WaitIfNecessary(scoped_refptr<MessagePipe> mp, 18 MojoResult WaitIfNecessary(scoped_refptr<MessagePipe> mp,
19 MojoHandleSignals signals, 19 MojoHandleSignals signals,
20 HandleSignalsState* signals_state) { 20 HandleSignalsState* signals_state) {
21 Waiter waiter; 21 Waiter waiter;
22 waiter.Init(); 22 waiter.Init();
23 23
24 MojoResult add_result = mp->AddWaiter(0, &waiter, signals, 0, signals_state); 24 MojoResult add_result = mp->AddWaiter(0, &waiter, signals, 0, signals_state);
25 if (add_result != MOJO_RESULT_OK) { 25 if (add_result != MOJO_RESULT_OK) {
26 return (add_result == MOJO_RESULT_ALREADY_EXISTS) ? MOJO_RESULT_OK 26 return (add_result == MOJO_RESULT_ALREADY_EXISTS) ? MOJO_RESULT_OK
27 : add_result; 27 : add_result;
28 } 28 }
29 29
30 MojoResult wait_result = waiter.Wait(MOJO_DEADLINE_INDEFINITE, NULL); 30 MojoResult wait_result = waiter.Wait(MOJO_DEADLINE_INDEFINITE, nullptr);
31 mp->RemoveWaiter(0, &waiter, signals_state); 31 mp->RemoveWaiter(0, &waiter, signals_state);
32 return wait_result; 32 return wait_result;
33 } 33 }
34 34
35 ChannelThread::ChannelThread(embedder::PlatformSupport* platform_support) 35 ChannelThread::ChannelThread(embedder::PlatformSupport* platform_support)
36 : platform_support_(platform_support), 36 : platform_support_(platform_support),
37 test_io_thread_(base::TestIOThread::kManualStart) { 37 test_io_thread_(base::TestIOThread::kManualStart) {
38 } 38 }
39 39
40 ChannelThread::~ChannelThread() { 40 ChannelThread::~ChannelThread() {
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 // message pipe endpoint is attached. 87 // message pipe endpoint is attached.
88 CHECK_EQ(channel_->AttachEndpoint(channel_endpoint), 88 CHECK_EQ(channel_->AttachEndpoint(channel_endpoint),
89 Channel::kBootstrapEndpointId); 89 Channel::kBootstrapEndpointId);
90 CHECK(channel_->RunMessagePipeEndpoint(Channel::kBootstrapEndpointId, 90 CHECK(channel_->RunMessagePipeEndpoint(Channel::kBootstrapEndpointId,
91 Channel::kBootstrapEndpointId)); 91 Channel::kBootstrapEndpointId));
92 } 92 }
93 93
94 void ChannelThread::ShutdownChannelOnIOThread() { 94 void ChannelThread::ShutdownChannelOnIOThread() {
95 CHECK(channel_.get()); 95 CHECK(channel_.get());
96 channel_->Shutdown(); 96 channel_->Shutdown();
97 channel_ = NULL; 97 channel_ = nullptr;
98 } 98 }
99 99
100 #if !defined(OS_IOS) 100 #if !defined(OS_IOS)
101 MultiprocessMessagePipeTestBase::MultiprocessMessagePipeTestBase() 101 MultiprocessMessagePipeTestBase::MultiprocessMessagePipeTestBase()
102 : channel_thread_(&platform_support_) { 102 : channel_thread_(&platform_support_) {
103 } 103 }
104 104
105 MultiprocessMessagePipeTestBase::~MultiprocessMessagePipeTestBase() { 105 MultiprocessMessagePipeTestBase::~MultiprocessMessagePipeTestBase() {
106 } 106 }
107 107
108 void MultiprocessMessagePipeTestBase::Init(scoped_refptr<ChannelEndpoint> ep) { 108 void MultiprocessMessagePipeTestBase::Init(scoped_refptr<ChannelEndpoint> ep) {
109 channel_thread_.Start(helper_.server_platform_handle.Pass(), ep); 109 channel_thread_.Start(helper_.server_platform_handle.Pass(), ep);
110 } 110 }
111 #endif 111 #endif
112 112
113 } // namespace test 113 } // namespace test
114 } // namespace system 114 } // namespace system
115 } // namespace mojo 115 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/system/message_pipe_perftest.cc ('k') | mojo/system/message_pipe_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698