From 220db613792b3fa65361e478ddd00da753e7aa7c Mon Sep 17 00:00:00 2001 From: sky Date: Wed, 23 Mar 2016 09:38:54 -0700 Subject: Changes to get mash browser_tests shutdown working correctly . Adds ability to set callback on MojoShellConnection when shell is lost, and wires through in chrome side to trigger exiting. . Adds ability for TestLauncherDelegate to be notified after tests have run. Needed so I can shutdown state while AtExitManager is valid. . Made context not attempt to shutdown edk if context did not start edk. . Made MashBrowserTestsMain shutdown MojoTestConnector at a time when it can be shutdown. BUG=581733 TEST=covered by tests R=jam@chromium.org Review URL: https://codereview.chromium.org/1822213002 Cr-Commit-Position: refs/heads/master@{#382864} --- mojo/shell/standalone/context.cc | 10 ++++++++-- mojo/shell/standalone/context.h | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'mojo') diff --git a/mojo/shell/standalone/context.cc b/mojo/shell/standalone/context.cc index e64ed82..c036694 100644 --- a/mojo/shell/standalone/context.cc +++ b/mojo/shell/standalone/context.cc @@ -140,7 +140,8 @@ void Context::Init(scoped_ptr init_params) { blocking_pool_ = new base::SequencedWorkerPool(kMaxBlockingPoolThreads, "blocking_pool"); - if (!init_params || init_params->init_edk) { + init_edk_ = !init_params || init_params->init_edk; + if (init_edk_) { edk::InitIPCSupport(this, io_thread_->task_runner().get()); #if defined(OS_MACOSX) edk::SetMachPortProvider(MachBroker::GetInstance()->port_provider()); @@ -210,8 +211,13 @@ void Context::Shutdown() { // loop shutdown. shell_.reset(); - TRACE_EVENT0("mojo_shell", "Context::Shutdown"); DCHECK_EQ(base::MessageLoop::current()->task_runner(), shell_runner_); + + // If we didn't initialize the edk we should not shut it down. + if (!init_edk_) + return; + + TRACE_EVENT0("mojo_shell", "Context::Shutdown"); // Post a task in case OnShutdownComplete is called synchronously. base::MessageLoop::current()->PostTask(FROM_HERE, base::Bind(edk::ShutdownIPCSupport)); diff --git a/mojo/shell/standalone/context.h b/mojo/shell/standalone/context.h index 3c25027..fee1e5a 100644 --- a/mojo/shell/standalone/context.h +++ b/mojo/shell/standalone/context.h @@ -75,6 +75,7 @@ class Context : public edk::ProcessDelegate { scoped_ptr catalog_; scoped_ptr shell_; base::Time main_entry_time_; + bool init_edk_ = false; DISALLOW_COPY_AND_ASSIGN(Context); }; -- cgit v1.1