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

mojo/shell/application_manager_unittest.cc

Index: mojo/shell/application_manager_unittest.cc
diff --git a/mojo/shell/application_manager_unittest.cc b/mojo/shell/application_manager_unittest.cc
index 36aa99331342d330fd45a871ad243257edbe7df7..8ce4303c7966e36767d43667ec996a5134e65be7 100644
--- a/mojo/shell/application_manager_unittest.cc
+++ b/mojo/shell/application_manager_unittest.cc
@@ -120,7 +120,7 @@ class TestApplicationLoader : public ApplicationLoader,
 
   // mojo::ShellClient implementation.
   bool AcceptConnection(Connection* connection) override {
-    connection->AddService<TestService>(this);
+    connection->AddInterface<TestService>(this);
     last_requestor_url_ = GURL(connection->GetRemoteApplicationURL());
     return true;
   }
@@ -251,8 +251,8 @@ class TestAImpl : public TestA {
             InterfaceFactory<TestC>* factory)
       : test_context_(test_context), binding_(this, std::move(request)) {
     connection_ = app_impl->Connect(kTestBURLString);
-    connection_->AddService<TestC>(factory);
-    connection_->ConnectToService(&b_);
+    connection_->AddInterface<TestC>(factory);
+    connection_->GetInterface(&b_);
   }
 
   ~TestAImpl() override {
@@ -288,7 +288,7 @@ class TestBImpl : public TestB {
             TesterContext* test_context,
             InterfaceRequest<TestB> request)
       : test_context_(test_context), binding_(this, std::move(request)) {
-    connection->ConnectToService(&c_);
+    connection->GetInterface(&c_);
   }
 
   ~TestBImpl() override {
@@ -359,9 +359,9 @@ class Tester : public ShellClient,
     }
     // If we're coming from A, then add B, otherwise A.
     if (connection->GetRemoteApplicationURL() == kTestAURLString)
-      connection->AddService<TestB>(this);
+      connection->AddInterface<TestB>(this);
     else
-      connection->AddService<TestA>(this);
+      connection->AddInterface<TestA>(this);
     return true;
   }