Mojo EDK: Clean shutdown for ScopedIPCSupport in tests

mojo/edk/test/scoped_ipc_support.cc

 // Copyright 2015 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/edk/test/scoped_ipc_support.h"
 
 #include <utility>
 
 #include "base/message_loop/message_loop.h"
 #include "mojo/edk/embedder/embedder.h"
 
 namespace mojo {
 namespace edk {
 namespace test {
 
 namespace {
 base::TaskRunner* g_io_task_runner = nullptr;
 }
 
 base::TaskRunner* GetIoTaskRunner() {
   return g_io_task_runner;
 }
 
-namespace internal {
-
-ScopedIPCSupportHelper::ScopedIPCSupportHelper() {
-}
-
-ScopedIPCSupportHelper::~ScopedIPCSupportHelper() {
-  ShutdownIPCSupport();
-  run_loop_.Run();
-}
-
-void ScopedIPCSupportHelper::Init(
-    ProcessDelegate* process_delegate,
-    scoped_refptr<base::TaskRunner> io_thread_task_runner) {
-  io_thread_task_runner_ = io_thread_task_runner;
-  InitIPCSupport(process_delegate, io_thread_task_runner_);
-}
-
-void ScopedIPCSupportHelper::OnShutdownCompleteImpl() {
-  run_loop_.Quit();
-}
-
-}  // namespace internal
-
 ScopedIPCSupport::ScopedIPCSupport(
     scoped_refptr<base::TaskRunner> io_thread_task_runner) {
   g_io_task_runner = io_thread_task_runner.get();
-  helper_.Init(this, std::move(io_thread_task_runner));
+  InitIPCSupport(this, io_thread_task_runner);
 }
 
 ScopedIPCSupport::~ScopedIPCSupport() {
+  base::RunLoop run_loop;
+  quit_closure = run_loop.QuitClosure();
+  ShutdownIPCSupport();
+  run_loop.Run();
 }
 
 void ScopedIPCSupport::OnShutdownComplete() {
-  helper_.OnShutdownCompleteImpl();
+  DCHECK(!quit_closure.is_null());
+  quit_closure.Run();

[yzshen1, 2016/11/20 06:07:35]

(My understanding of the embedder API is purely from the comments. :))

I think this method is called from the IO thread, which is usually different
from the thread where the destructor of ScopedIPCSupport is called. If that is
the case, calling quit_closure.Run directly is not safe, right?

 }
 
 }  // namespace test
 }  // namespace edk
 }  // namespace mojo