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

mojo/shell/application_manager_unittest.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 "mojo/shell/application_manager.h"
 
 #include <utility>
 
 #include "base/at_exit.h"
 #include "base/bind.h"
@@ skipping 102 matching lines @@
  private:
   // ApplicationLoader implementation.
   void Load(const GURL& url,
             InterfaceRequest<mojom::ShellClient> request) override {
     ++num_loads_;
     shell_connection_.reset(new ShellConnection(this, std::move(request)));
   }
 
   // mojo::ShellClient implementation.
   bool AcceptConnection(Connection* connection) override {
-    connection->AddService<TestService>(this);
+    connection->AddInterface<TestService>(this);
     last_requestor_url_ = GURL(connection->GetRemoteApplicationURL());
     return true;
   }
 
   // InterfaceFactory<TestService> implementation.
   void Create(Connection* connection,
               InterfaceRequest<TestService> request) override {
     new TestServiceImpl(context_, std::move(request));
   }
 
@@ skipping 110 matching lines @@
 
 // Used to test that the requestor url will be correctly passed.
 class TestAImpl : public TestA {
  public:
   TestAImpl(ShellConnection* app_impl,
             TesterContext* test_context,
             InterfaceRequest<TestA> request,
             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 {
     test_context_->IncrementNumADeletes();
     if (base::MessageLoop::current()->is_running())
       Quit();
   }
 
  private:
   void CallB() override {
@@ skipping 15 matching lines @@
   TestBPtr b_;
   StrongBinding<TestA> binding_;
 };
 
 class TestBImpl : public TestB {
  public:
   TestBImpl(Connection* connection,
             TesterContext* test_context,
             InterfaceRequest<TestB> request)
       : test_context_(test_context), binding_(this, std::move(request)) {
-    connection->ConnectToService(&c_);
+    connection->GetInterface(&c_);
   }
 
   ~TestBImpl() override {
     test_context_->IncrementNumBDeletes();
     if (base::MessageLoop::current()->is_running())
       base::MessageLoop::current()->QuitWhenIdle();
     test_context_->QuitSoon();
   }
 
  private:
@@ skipping 50 matching lines @@
   bool AcceptConnection(Connection* connection) override {
     if (!requestor_url_.empty() &&
         requestor_url_ != connection->GetRemoteApplicationURL()) {
       context_->set_tester_called_quit();
       context_->QuitSoon();
       base::MessageLoop::current()->QuitWhenIdle();
       return false;
     }
     // 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;
   }
 
   void Create(Connection* connection,
               InterfaceRequest<TestA> request) override {
     a_bindings_.push_back(
         new TestAImpl(app_.get(), context_, std::move(request), this));
   }
 
   void Create(Connection* connection,
@@ skipping 246 matching lines @@
 
   // A different identity because the domain is different.
   ConnectToService(application_manager_.get(),
                    GURL("http://www.another_domain.org/abc"), &test_service);
   EXPECT_EQ(4, test_loader_->num_loads());
 }
 
 }  // namespace test
 }  // namespace shell
 }  // namespace mojo