Add a new BindInterface() method to Connector.

services/service_manager/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/cpp/bindings/binding_set.h"
 #include "services/service_manager/public/c/main.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/service_manager/public/cpp/interface_factory.h"
@@ skipping 24 matching lines @@
 
   // InterfaceFactory<mojom::ShutdownTestClientController>:
   void Create(const Identity& remote_identity,
               mojom::ShutdownTestClientControllerRequest request) override {
     bindings_.AddBinding(this, std::move(request));
   }
 
   // mojom::ShutdownTestClientController:
   void ConnectAndWait(const ConnectAndWaitCallback& callback) override {
     mojom::ShutdownTestServicePtr service;
-    context()->connector()->ConnectToInterface(
-        "shutdown_service", &service);
+    context()->connector()->BindInterface("shutdown_service", &service);
 
     mojo::Binding<mojom::ShutdownTestClient> client_binding(this);
 
     mojom::ShutdownTestClientPtr client_ptr =
         client_binding.CreateInterfacePtrAndBind();
 
     service->SetClient(std::move(client_ptr));
 
     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();
   }
 
   mojo::BindingSet<mojom::ShutdownTestClientController> bindings_;
 
   DISALLOW_COPY_AND_ASSIGN(ShutdownClientApp);
 };
 
 }  // namespace service_manager
 
 MojoResult ServiceMain(MojoHandle service_request_handle) {
   service_manager::ServiceRunner runner(new service_manager::ShutdownClientApp);
   return runner.Run(service_request_handle);
 }