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

Side by Side Diff: mojo/system/message_pipe_test_utils.cc

Issue 623883002: Revert "Move mojo edk into mojo/edk" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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_test_utils.h ('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/edk/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/edk/system/channel.h" 9 #include "mojo/system/channel.h"
10 #include "mojo/edk/system/channel_endpoint.h" 10 #include "mojo/system/channel_endpoint.h"
11 #include "mojo/edk/system/message_pipe.h" 11 #include "mojo/system/message_pipe.h"
12 #include "mojo/edk/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();
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
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_test_utils.h ('k') | mojo/system/message_pipe_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698