Remove mojo::edk::test::ScopedIPCSupport

components/nacl/common/nacl_service.cc

 // 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.
 
 #include "components/nacl/common/nacl_service.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
@@ skipping 83 matching lines @@
   registry->AddInterface(base::Bind(&ConnectBootstrapChannel,
                                     base::Passed(&ipc_channel_bootstrap_)));
   return true;
 }
 
 }  // namespace
 
 std::unique_ptr<service_manager::ServiceContext> CreateNaClServiceContext(
     scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
     mojo::ScopedMessagePipeHandle* ipc_channel) {
-  auto ipc_support =
-      base::MakeUnique<mojo::edk::ScopedIPCSupport>(std::move(io_task_runner));
+  auto ipc_support = base::MakeUnique<mojo::edk::ScopedIPCSupport>(
+      std::move(io_task_runner),
+      mojo::edk::ScopedIPCSupport::ShutdownPolicy::FAST);
   EstablishMojoConnection();
 
   IPC::mojom::ChannelBootstrapPtr bootstrap;
   *ipc_channel = mojo::MakeRequest(&bootstrap).PassMessagePipe();
   return base::MakeUnique<service_manager::ServiceContext>(
       base::MakeUnique<NaClService>(bootstrap.PassInterface(),
                                     std::move(ipc_support)),
       ConnectToServiceManager());
 }