Rename Connection::AddService/ConnectToService to Connection::AddInterface/GetInterface

components/mus/mus_app.cc

 // Copyright 2014 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/mus/mus_app.h"
 
 #include "base/stl_util.h"
 #include "build/build_config.h"
 #include "components/mus/common/args.h"
 #include "components/mus/gles2/gpu_impl.h"
@@ skipping 73 matching lines @@
   // TODO(rjkroege): It is possible that we might want to generalize the
   // GpuState object.
   if (!gpu_state_.get())
     gpu_state_ = new GpuState(hardware_rendering_available);
   connection_manager_.reset(new ws::ConnectionManager(this, surfaces_state_));
 
   tracing_.Initialize(shell, url);
 }
 
 bool MandolineUIServicesApp::AcceptConnection(Connection* connection) {
-  connection->AddService<Gpu>(this);
-  connection->AddService<mojom::DisplayManager>(this);
-  connection->AddService<mojom::WindowManagerFactoryService>(this);
-  connection->AddService<mojom::WindowTreeFactory>(this);
-  connection->AddService<WindowTreeHostFactory>(this);
+  connection->AddInterface<Gpu>(this);
+  connection->AddInterface<mojom::DisplayManager>(this);
+  connection->AddInterface<mojom::WindowManagerFactoryService>(this);
+  connection->AddInterface<mojom::WindowTreeFactory>(this);
+  connection->AddInterface<WindowTreeHostFactory>(this);
   return true;
 }
 
 void MandolineUIServicesApp::OnFirstRootConnectionCreated() {
   PendingRequests requests;
   requests.swap(pending_requests_);
   for (auto& request : requests) {
     if (request->dm_request)
       Create(nullptr, std::move(*request->dm_request));
     else
@@ skipping 78 matching lines @@
   ws::WindowTreeHostImpl* host_impl = new ws::WindowTreeHostImpl(
       connection_manager_.get(), shell_, gpu_state_, surfaces_state_);
 
   // WindowTreeHostConnection manages its own lifetime.
   host_impl->Init(new ws::WindowTreeHostConnectionImpl(
       std::move(host), make_scoped_ptr(host_impl), std::move(tree_client),
       connection_manager_.get()));
 }
 
 }  // namespace mus