Remove mojo::edk::test::ScopedIPCSupport

services/service_manager/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 "services/service_manager/standalone/context.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <utility>
@@ skipping 131 matching lines @@
 
   if (!init_params || init_params->init_edk)
     EnsureEmbedderIsInitialized();
 
   service_manager_runner_ = base::ThreadTaskRunnerHandle::Get();
   blocking_pool_ = new base::SequencedWorkerPool(
       kThreadPoolMaxThreads, "blocking_pool", base::TaskPriority::USER_VISIBLE);
 
   init_edk_ = !init_params || init_params->init_edk;
   if (init_edk_) {
-    mojo::edk::InitIPCSupport(this, io_thread_->task_runner().get());
+    mojo::edk::InitIPCSupport(io_thread_->task_runner().get());
 #if defined(OS_MACOSX)
     mojo::edk::SetMachPortProvider(MachBroker::GetInstance()->port_provider());
 #endif
   }
 
   std::unique_ptr<ServiceProcessLauncherFactory>
       service_process_launcher_factory =
       base::MakeUnique<ServiceProcessLauncherFactoryImpl>(
           blocking_pool_.get(),
           init_params ? init_params->service_process_launcher_delegate
@@ skipping 73 matching lines @@
   // loop shutdown.
   service_manager_.reset();
 
   DCHECK_EQ(base::ThreadTaskRunnerHandle::Get(), service_manager_runner_);
 
   // If we didn't initialize the edk we should not shut it down.
   if (!init_edk_)
     return;
 
   TRACE_EVENT0("service_manager", "Context::Shutdown");
-  // Post a task in case OnShutdownComplete is called synchronously.
-  base::ThreadTaskRunnerHandle::Get()->PostTask(
-      FROM_HERE, base::Bind(mojo::edk::ShutdownIPCSupport));
+  mojo::edk::ShutdownIPCSupport(
+      base::Bind(IgnoreResult(&base::TaskRunner::PostTask),
+                 base::ThreadTaskRunnerHandle::Get(), FROM_HERE,
+                 base::Bind(&Context::OnShutdownComplete,
+                            base::Unretained(this))));
   // We'll quit when we get OnShutdownComplete().
   base::RunLoop().Run();
 }
 
 void Context::OnShutdownComplete() {
   DCHECK_EQ(base::ThreadTaskRunnerHandle::Get(), service_manager_runner_);
   base::MessageLoop::current()->QuitWhenIdle();
 }
 
 void Context::RunCommandLineApplication() {
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(kService))
     Run(command_line->GetSwitchValueASCII(kService));
 }
 
 void Context::Run(const std::string& name) {
   service_manager_->SetInstanceQuitCallback(base::Bind(&OnInstanceQuit, name));
 
   mojom::InterfaceProviderPtr remote_interfaces;
   mojom::InterfaceProviderPtr local_interfaces;
 
   std::unique_ptr<ConnectParams> params(new ConnectParams);
   params->set_source(CreateServiceManagerIdentity());
   params->set_target(Identity(name, mojom::kRootUserID));
   params->set_remote_interfaces(mojo::MakeRequest(&remote_interfaces));
   service_manager_->Connect(std::move(params));
 }
 
 }  // namespace service_manager