Use ScopedTaskEnvironment instead of MessageLoop in service_manager::test::ServiceTest.

services/service_manager/public/cpp/service_test.cc

 // Copyright 2016 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/service_manager/public/cpp/service_test.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/threading/thread.h"
@@ skipping 14 matching lines @@
 void ServiceTestClient::OnStart() {
   test_->OnStartCalled(context()->connector(), context()->identity().name(),
                        context()->identity().user_id());
 }
 
 void ServiceTestClient::OnBindInterface(
     const BindSourceInfo& source_info,
     const std::string& interface_name,
     mojo::ScopedMessagePipeHandle interface_pipe) {}
 
-ServiceTest::ServiceTest() {}
+ServiceTest::ServiceTest() : ServiceTest(std::string(), true) {}
 
 ServiceTest::ServiceTest(const std::string& test_name, bool init_edk)
-    : test_name_(test_name), init_edk_(init_edk) {}
+    : scoped_task_environment_(
+          base::test::ScopedTaskEnvironment::MainThreadType::UI),
+      test_name_(test_name),
+      init_edk_(init_edk) {}
 
 ServiceTest::~ServiceTest() {}
 
 void ServiceTest::InitTestName(const std::string& test_name) {
   DCHECK(test_name_.empty());
   test_name_ = test_name;
 }
 
 std::unique_ptr<Service> ServiceTest::CreateService() {
   return base::MakeUnique<ServiceTestClient>(this);
 }
 
-std::unique_ptr<base::MessageLoop> ServiceTest::CreateMessageLoop() {
-  return base::MakeUnique<base::MessageLoop>();
-}
-
 void ServiceTest::OnStartCalled(Connector* connector,
                                 const std::string& name,
                                 const std::string& user_id) {
   DCHECK_EQ(connector_, connector);
   initialize_name_ = name;
   initialize_userid_ = user_id;
   initialize_called_.Run();
 }
 
 void ServiceTest::SetUp() {
-  message_loop_ = CreateMessageLoop();
-
   DCHECK(!init_edk_);
 
   background_service_manager_ =
       base::MakeUnique<service_manager::BackgroundServiceManager>(nullptr,
                                                                   nullptr);
 
   // Create the service manager connection. We don't proceed until we get our
   // Service's OnStart() method is called.
   base::RunLoop run_loop;
   base::MessageLoop::ScopedNestableTaskAllower allow(
       base::MessageLoop::current());
   initialize_called_ = run_loop.QuitClosure();
 
   mojom::ServicePtr service;
   context_ = base::MakeUnique<ServiceContext>(CreateService(),
                                               mojom::ServiceRequest(&service));
   background_service_manager_->RegisterService(
       Identity(test_name_, mojom::kRootUserID), std::move(service), nullptr);
   connector_ = context_->connector();
   run_loop.Run();
 }
 
 void ServiceTest::TearDown() {
   background_service_manager_.reset();
   context_.reset();
-  message_loop_.reset();
 }
 
 }  // namespace test
 }  // namespace service_manager