Index: mojo/application/public/cpp/lib/application_runner.cc |
diff --git a/mojo/application/public/cpp/lib/application_runner.cc b/mojo/application/public/cpp/lib/application_runner.cc |
index 5afd825aa389d54a8fda12740e9c0656a3772200..aba1576e33c1050371203c7e34b85b334a74dfc3 100644 |
--- a/mojo/application/public/cpp/lib/application_runner.cc |
+++ b/mojo/application/public/cpp/lib/application_runner.cc |
@@ -45,16 +45,18 @@ void ApplicationRunner::set_message_loop_type(base::MessageLoop::Type type) { |
message_loop_type_ = type; |
} |
-MojoResult ApplicationRunner::Run(MojoHandle application_request_handle) { |
+MojoResult ApplicationRunner::Run(MojoHandle application_request_handle, |
+ bool init_base) { |
DCHECK(!has_run_); |
has_run_ = true; |
- InitBaseCommandLine(); |
- base::AtExitManager at_exit; |
- |
+ if (init_base) { |
+ InitBaseCommandLine(); |
+ base::AtExitManager at_exit; |
#ifndef NDEBUG |
- base::debug::EnableInProcessStackDumping(); |
+ base::debug::EnableInProcessStackDumping(); |
#endif |
+ } |
{ |
scoped_ptr<base::MessageLoop> loop; |
@@ -79,4 +81,8 @@ MojoResult ApplicationRunner::Run(MojoHandle application_request_handle) { |
return MOJO_RESULT_OK; |
} |
+MojoResult ApplicationRunner::Run(MojoHandle application_request_handle) { |
+ return Run(application_request_handle, true); |
+} |
+ |
} // namespace mojo |