Index: mojo/shell/public/cpp/lib/application_runner.cc |
diff --git a/mojo/shell/public/cpp/lib/application_runner.cc b/mojo/shell/public/cpp/lib/application_runner.cc |
index c4aba6d2b0cfa5acf30864e18411586435b687d5..785ed643a5b1cae36e861ad07c4d75f66d296fef 100644 |
--- a/mojo/shell/public/cpp/lib/application_runner.cc |
+++ b/mojo/shell/public/cpp/lib/application_runner.cc |
@@ -72,7 +72,12 @@ MojoResult ApplicationRunner::Run(MojoHandle shell_client_request_handle, |
} |
MojoResult ApplicationRunner::Run(MojoHandle shell_client_request_handle) { |
- return Run(shell_client_request_handle, true); |
+ bool init_base = true; |
+ if (base::CommandLine::InitializedForCurrentProcess()) { |
+ init_base = |
+ !base::CommandLine::ForCurrentProcess()->HasSwitch("single-process"); |
+ } |
+ return Run(shell_client_request_handle, init_base); |
} |
} // namespace mojo |