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

Unified Diff: base/test/test_support_android.cc

Issue 1952513003: Fix Android multi-process tests on M. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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
« base/posix/global_descriptors.h ('K') | « base/test/multiprocess_test_android.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/test/test_support_android.cc
diff --git a/base/test/test_support_android.cc b/base/test/test_support_android.cc
index 08a2820b800418cbcdbb2649fd58f7e274de7324..f8441bd1ba5f9d75fe8e52258c6d339f24763514 100644
--- a/base/test/test_support_android.cc
+++ b/base/test/test_support_android.cc
@@ -14,6 +14,7 @@
#include "base/message_loop/message_pump_android.h"
#include "base/path_service.h"
#include "base/synchronization/waitable_event.h"
+#include "base/test/multiprocess_test.h"
namespace {
@@ -176,8 +177,10 @@ void InitAndroidTestMessageLoop() {
}
void InitAndroidTest() {
- InitAndroidTestLogging();
- InitAndroidTestPaths();
+ if (!base::AndroidIsChildProcess()) {
+ InitAndroidTestLogging();
+ InitAndroidTestPaths();
+ }
InitAndroidTestMessageLoop();
}
} // namespace base
« base/posix/global_descriptors.h ('K') | « base/test/multiprocess_test_android.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698