Index: mandoline/app/desktop/launcher_process.cc |
diff --git a/mandoline/app/desktop/launcher_process.cc b/mandoline/app/desktop/launcher_process.cc |
index 132d0333a2873dc2d1edb16d373942c9f698037b..6fa79561b63e0e282c176151447c2523e665d89b 100644 |
--- a/mandoline/app/desktop/launcher_process.cc |
+++ b/mandoline/app/desktop/launcher_process.cc |
@@ -2,6 +2,8 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
+#include "mandoline/app/desktop/launcher_process.h" |
+ |
#include <stdio.h> |
#include <string.h> |
@@ -18,7 +20,7 @@ |
#include "components/tracing/trace_config_file.h" |
#include "components/tracing/tracing_switches.h" |
#include "mandoline/app/core_services_initialization.h" |
-#include "mandoline/app/desktop/launcher_process.h" |
+#include "mandoline/ui/common/mandoline_switches.h" |
#include "mojo/runner/context.h" |
#include "mojo/runner/switches.h" |
@@ -112,10 +114,14 @@ int LauncherProcessMain(int argc, char** argv) { |
base::TimeDelta::FromSeconds(5)); |
} |
+ bool check_sys_deps = |
+ command_line.HasSwitch(switches::kCheckLayoutTestSysDeps); |
+ bool run_layout_tests = command_line.HasSwitch(switches::kRunLayoutTest); |
+ GURL launch((run_layout_tests || check_sys_deps) ? "mojo:test_runner" |
+ : "mojo:desktop_ui"); |
message_loop.PostTask(FROM_HERE, |
base::Bind(&mojo::runner::Context::Run, |
- base::Unretained(&shell_context), |
- GURL("mojo:desktop_ui"))); |
+ base::Unretained(&shell_context), launch)); |
message_loop.Run(); |
// Must be called before |message_loop| is destroyed. |