Changes around how browser_tests are launched for mash

services/ui/service.cc

 // Copyright 2014 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 "services/ui/service.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 213 matching lines @@
   for (auto& request : requests) {
     if (request->wtf_request)
       Create(request->remote_identity, std::move(*request->wtf_request));
     else
       Create(request->remote_identity, std::move(*request->dm_request));
   }
 }
 
 void Service::OnNoMoreDisplays() {
   // We may get here from the destructor, in which case there is no messageloop.
-  if (base::MessageLoop::current())
+  if (base::MessageLoop::current() &&
+      base::MessageLoop::current()->is_running()) {
     base::MessageLoop::current()->QuitWhenIdle();
+  }
 }
 
 bool Service::IsTestConfig() const {
   return test_config_;
 }
 
 void Service::UpdateTouchTransforms() {
   if (touch_controller_)
     touch_controller_->UpdateTouchTransforms();
 }
@@ skipping 100 matching lines @@
 
 void Service::Create(const shell::Identity& remote_identity,
                      mojom::WindowServerTestRequest request) {
   if (!test_config_)
     return;
   new ws::WindowServerTestImpl(window_server_.get(), std::move(request));
 }
 
 
 }  // namespace ui