| 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
|
|
|