Use spin runloop instead of WaitForIncomingMethodCall() for test codes.

services/shell/tests/shutdown/shutdown_client_app.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 "base/macros.h"
+#include "base/run_loop.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "services/shell/public/cpp/application_runner.h"
 #include "services/shell/public/cpp/connector.h"
 #include "services/shell/public/cpp/interface_factory.h"
 #include "services/shell/public/cpp/service.h"
 #include "services/shell/tests/shutdown/shutdown_unittest.mojom.h"
 
 namespace shell {
 
@@ skipping 29 matching lines @@
     mojom::ShutdownTestServicePtr service;
     connector_->ConnectToInterface("mojo:shutdown_service", &service);
 
     mojo::Binding<mojom::ShutdownTestClient> client_binding(this);
 
     mojom::ShutdownTestClientPtr client_ptr =
         client_binding.CreateInterfacePtrAndBind();
 
     service->SetClient(std::move(client_ptr));
 
-    client_binding.WaitForIncomingMethodCall();
+    base::MessageLoop::ScopedNestableTaskAllower nestable_allower(
+        base::MessageLoop::current());
+    base::RunLoop run_loop;
+    client_binding.set_connection_error_handler(run_loop.QuitClosure());
+    run_loop.Run();
+
     callback.Run();
   }
 
   Connector* connector_ = nullptr;
   mojo::BindingSet<mojom::ShutdownTestClientController> bindings_;
 
   DISALLOW_COPY_AND_ASSIGN(ShutdownClientApp);
 };
 
 }  // namespace shell
 
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   return shell::ApplicationRunner(new shell::ShutdownClientApp)
       .Run(shell_handle);
 }