| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 #ifndef MOJO_EDK_TEST_MOJO_TEST_BASE_H_ | 5 #ifndef MOJO_EDK_TEST_MOJO_TEST_BASE_H_ |
| 6 #define MOJO_EDK_TEST_MOJO_TEST_BASE_H_ | 6 #define MOJO_EDK_TEST_MOJO_TEST_BASE_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 26 matching lines...) Expand all Loading... |
| 37 ClientController(const std::string& client_name, MojoTestBase* test); | 37 ClientController(const std::string& client_name, MojoTestBase* test); |
| 38 ~ClientController(); | 38 ~ClientController(); |
| 39 | 39 |
| 40 MojoHandle pipe() const { return pipe_.get().value(); } | 40 MojoHandle pipe() const { return pipe_.get().value(); } |
| 41 | 41 |
| 42 int WaitForShutdown(); | 42 int WaitForShutdown(); |
| 43 | 43 |
| 44 private: | 44 private: |
| 45 friend class MojoTestBase; | 45 friend class MojoTestBase; |
| 46 | 46 |
| 47 MojoTestBase* test_; | |
| 48 #if !defined(OS_IOS) | 47 #if !defined(OS_IOS) |
| 49 MultiprocessTestHelper helper_; | 48 MultiprocessTestHelper helper_; |
| 50 #endif | 49 #endif |
| 51 ScopedMessagePipeHandle pipe_; | 50 ScopedMessagePipeHandle pipe_; |
| 52 bool was_shutdown_ = false; | 51 bool was_shutdown_ = false; |
| 53 | 52 |
| 54 DISALLOW_COPY_AND_ASSIGN(ClientController); | 53 DISALLOW_COPY_AND_ASSIGN(ClientController); |
| 55 }; | 54 }; |
| 56 | 55 |
| 57 ClientController& StartClient(const std::string& client_name); | 56 ClientController& StartClient(const std::string& client_name); |
| (...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 216 #else // !defined(OS_IOS) | 215 #else // !defined(OS_IOS) |
| 217 #define DEFINE_TEST_CLIENT_WITH_PIPE(client_name, test_base, pipe_name) | 216 #define DEFINE_TEST_CLIENT_WITH_PIPE(client_name, test_base, pipe_name) |
| 218 #define DEFINE_TEST_CLIENT_TEST_WITH_PIPE(client_name, test_base, pipe_name) | 217 #define DEFINE_TEST_CLIENT_TEST_WITH_PIPE(client_name, test_base, pipe_name) |
| 219 #endif // !defined(OS_IOS) | 218 #endif // !defined(OS_IOS) |
| 220 | 219 |
| 221 } // namespace test | 220 } // namespace test |
| 222 } // namespace edk | 221 } // namespace edk |
| 223 } // namespace mojo | 222 } // namespace mojo |
| 224 | 223 |
| 225 #endif // MOJO_EDK_TEST_MOJO_TEST_BASE_H_ | 224 #endif // MOJO_EDK_TEST_MOJO_TEST_BASE_H_ |
| OLD | NEW |