Mojo EDK: Clean shutdown for ScopedIPCSupport in tests

mojo/edk/test/run_all_unittests.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 <signal.h>
 
+#include <memory>
+
 #include "base/bind.h"
 #include "base/command_line.h"
+#include "base/message_loop/message_loop.h"
 #include "base/test/launcher/unit_test_launcher.h"
 #include "base/test/multiprocess_test.h"
 #include "base/test/test_io_thread.h"
 #include "base/test/test_suite.h"
 #include "mojo/edk/embedder/embedder.h"
 #include "mojo/edk/test/multiprocess_test_helper.h"
 #include "mojo/edk/test/scoped_ipc_support.h"
 #include "mojo/edk/test/test_support_impl.h"
 #include "mojo/public/tests/test_support_private.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 17 matching lines @@
   // Removing the signal handler solves this issue.
   signal(SIGABRT, SIG_DFL);
 #endif
 
   base::TestSuite test_suite(argc, argv);
 
   mojo::edk::Init();
 
   mojo::test::TestSupport::Init(new mojo::edk::test::TestSupportImpl());
   base::TestIOThread test_io_thread(base::TestIOThread::kAutoStart);
-  // Leak this because its destructor calls mojo::edk::ShutdownIPCSupport which
-  // really does nothing in the new EDK but does depend on the current message
-  // loop, which is destructed inside base::LaunchUnitTests.
-  new mojo::edk::test::ScopedIPCSupport(test_io_thread.task_runner());
 
-  return base::LaunchUnitTests(
+  std::unique_ptr<mojo::edk::test::ScopedIPCSupport> ipc_support(
+      new mojo::edk::test::ScopedIPCSupport(test_io_thread.task_runner()));
+
+  int result = base::LaunchUnitTests(
       argc, argv,
       base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite)));
+
+  // NOTE: ScopedIPCSupport's destructor requires a MessageLoop to be running.
+  // We create one here solely for that purpose.
+  base::MessageLoop shutdown_loop;
+  ipc_support.reset();
+
+  return result;
 }