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

Unified Diff: mojo/edk/test/mojo_test_base.cc

Issue 1676913002: [mojo] Delete third_party/mojo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: let's try that again Created 4 years, 10 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/edk/test/mojo_test_base.h ('k') | mojo/edk/test/run_all_perftests.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/edk/test/mojo_test_base.cc
diff --git a/mojo/edk/test/mojo_test_base.cc b/mojo/edk/test/mojo_test_base.cc
index 028f5d0eceb0274a8ba5fce35107f3f72cd60e74..27c92bb9b2e01384c6ccfab76595613bc76f7bc9 100644
--- a/mojo/edk/test/mojo_test_base.cc
+++ b/mojo/edk/test/mojo_test_base.cc
@@ -30,8 +30,12 @@ MojoTestBase::ClientController& MojoTestBase::StartClient(
MojoTestBase::ClientController::ClientController(const std::string& client_name,
MojoTestBase* test)
- : test_(test),
- pipe_(helper_.StartChild(client_name)) {
+ : test_(test)
+#if !defined(OS_IOS)
+ ,
+ pipe_(helper_.StartChild(client_name))
+#endif
+{
}
MojoTestBase::ClientController::~ClientController() {
@@ -41,7 +45,12 @@ MojoTestBase::ClientController::~ClientController() {
int MojoTestBase::ClientController::WaitForShutdown() {
was_shutdown_ = true;
+#if !defined(OS_IOS)
return helper_.WaitForChildShutdown();
+#else
+ NOTREACHED();
+ return 1;
+#endif
}
// static
« no previous file with comments | « mojo/edk/test/mojo_test_base.h ('k') | mojo/edk/test/run_all_perftests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698