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

services/service_manager/public/cpp/service_test.h

 // 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.
 
 #ifndef SERVICES_SERVICE_MANAGER_PUBLIC_CPP_SERVICE_TEST_H_
 #define SERVICES_SERVICE_MANAGER_PUBLIC_CPP_SERVICE_TEST_H_
 
 #include <memory>
 
 #include "base/macros.h"
+#include "base/test/scoped_task_environment.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/service_manager/public/cpp/service.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
-class MessageLoop;
 class Thread;
 }
 
 namespace mojo {
 namespace edk {
 class ScopedIPCSupport;
 }
 }
 
 namespace service_manager {
@@ skipping 46 matching lines @@
   const std::string& test_name() const { return initialize_name_; }
   const std::string& test_userid() const { return initialize_userid_; }
   uint32_t test_instance_id() const { return initialize_instance_id_; }
 
   // By default, creates a simple Service that captures the metadata sent
   // via OnStart(). Override to customize, but custom implementations must
   // call OnStartCalled() to forward the metadata so test_name() etc all
   // work.
   virtual std::unique_ptr<Service> CreateService();
 
-  virtual std::unique_ptr<base::MessageLoop> CreateMessageLoop();
-
   // Call to set OnStart() metadata when GetService() is overridden.
   void OnStartCalled(Connector* connector,
                      const std::string& name,
                      const std::string& userid);
 
   // testing::Test:
   void SetUp() override;
   void TearDown() override;
 
  private:
   friend ServiceTestClient;
 
+  base::test::ScopedTaskEnvironment scoped_task_environment_;
   std::unique_ptr<ServiceContext> context_;
-  std::unique_ptr<base::MessageLoop> message_loop_;
   std::unique_ptr<BackgroundServiceManager> background_service_manager_;
 
   // See constructor.
   std::string test_name_;
-  bool init_edk_ = true;
+  bool init_edk_;
   std::unique_ptr<base::Thread> ipc_thread_;
   std::unique_ptr<mojo::edk::ScopedIPCSupport> ipc_support_;
 
   Connector* connector_ = nullptr;
   std::string initialize_name_;
   std::string initialize_userid_ = service_manager::mojom::kInheritUserID;
   uint32_t initialize_instance_id_ = service_manager::mojom::kInvalidInstanceID;
 
   base::Closure initialize_called_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceTest);
 };
 
 }  // namespace test
 }  // namespace service_manager
 
 #endif  // SERVICES_SERVICE_MANAGER_PUBLIC_CPP_SERVICE_TEST_H_