Changes to get mash browser_tests shutdown working correctly

mojo/shell/standalone/context.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mojo/shell/standalone/context.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <utility>
@@ skipping 122 matching lines @@
         "mojo_runner.trace");
   }
 
   if (!init_params || init_params->init_edk)
     EnsureEmbedderIsInitialized();
 
   shell_runner_ = base::MessageLoop::current()->task_runner();
   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());
 #endif
   }
 
   scoped_ptr<NativeRunnerFactory> runner_factory;
   if (command_line.HasSwitch(switches::kSingleProcess)) {
 #if defined(COMPONENT_BUILD)
     LOG(ERROR) << "Running Mojo in single process component build, which isn't "
@@ skipping 49 matching lines @@
     collector->SetShellMainEntryPointTime(main_entry_time_.ToInternalValue());
   }
 }
 
 void Context::Shutdown() {
   // Actions triggered by Shell's destructor may require a current message loop,
   // so we should destruct it explicitly now as ~Context() occurs post message
   // loop shutdown.
   shell_.reset();
 
+  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");
-  DCHECK_EQ(base::MessageLoop::current()->task_runner(), shell_runner_);
   // Post a task in case OnShutdownComplete is called synchronously.
   base::MessageLoop::current()->PostTask(FROM_HERE,
                                          base::Bind(edk::ShutdownIPCSupport));
   // We'll quit when we get OnShutdownComplete().
   base::MessageLoop::current()->Run();
 }
 
 void Context::OnShutdownComplete() {
   DCHECK_EQ(base::MessageLoop::current()->task_runner(), shell_runner_);
   base::MessageLoop::current()->QuitWhenIdle();
@@ skipping 24 matching lines @@
   scoped_ptr<ConnectParams> params(new ConnectParams);
   params->set_source(CreateShellIdentity());
   params->set_target(Identity(name, mojom::kRootUserID));
   params->set_remote_interfaces(GetProxy(&remote_interfaces));
   params->set_local_interfaces(std::move(local_interfaces));
   shell_->Connect(std::move(params));
 }
 
 }  // namespace shell
 }  // namespace mojo