Remove ShutdownIPCSupportAndWaitForNoChannels.

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 "base/message_loop/message_loop.h"
 #include "mojo/edk/embedder/embedder.h"
 
 namespace mojo {
 namespace edk {
 namespace test {
 
 namespace internal {
 
 ScopedIPCSupportHelper::ScopedIPCSupportHelper() {
 }
 
 ScopedIPCSupportHelper::~ScopedIPCSupportHelper() {
   if (base::MessageLoop::current() &&
       base::MessageLoop::current()->task_runner() == io_thread_task_runner_) {
     ShutdownIPCSupportOnIOThread();
   } else {
-    ShutdownIPCSupportAndWaitForNoChannels();
+    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_);
 }
@@ skipping 12 matching lines @@
 ScopedIPCSupport::~ScopedIPCSupport() {
 }
 
 void ScopedIPCSupport::OnShutdownComplete() {
   helper_.OnShutdownCompleteImpl();
 }
 
 }  // namespace test
 }  // namespace edk
 }  // namespace mojo