| Index: shell/context_unittest.cc
|
| diff --git a/shell/context_unittest.cc b/shell/context_unittest.cc
|
| index b8accaaa5e683cc90503faf1fa34216cdbc6b446..7611ea8fd602eb1dbe2679fab5f8339ddc052dd8 100644
|
| --- a/shell/context_unittest.cc
|
| +++ b/shell/context_unittest.cc
|
| @@ -6,6 +6,7 @@
|
|
|
| #include "base/files/file_path.h"
|
| #include "base/message_loop/message_loop.h"
|
| +#include "build/build_config.h"
|
| #include "mojo/common/message_pump_mojo.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| @@ -13,7 +14,15 @@ namespace mojo {
|
| namespace shell {
|
| namespace {
|
|
|
| -TEST(ContextTest, Paths) {
|
| +#if defined(OS_ANDROID)
|
| +// TODO(vtl): The command line doesn't get initialized in a reasonable way on
|
| +// Android, currently. (Relatedly, multiprocess tests are currently not
|
| +// supported.)
|
| +#define MAYBE_Paths DISABLED_Paths
|
| +#else
|
| +#define MAYBE_Paths Paths
|
| +#endif
|
| +TEST(ContextTest, MAYBE_Paths) {
|
| Context context;
|
| base::MessageLoop message_loop(
|
| scoped_ptr<base::MessagePump>(new common::MessagePumpMojo()));
|
|
|