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

mojo/shell/capability_filter_test.cc

 // Copyright 2015 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/capability_filter_test.h"
 
 #include <utility>
 
 #include "base/macros.h"
 #include "base/stl_util.h"
@@ skipping 38 matching lines @@
 
  private:
   // Overridden from ApplicationLoader:
   void Load(const GURL& url,
             InterfaceRequest<mojom::ShellClient> request) override {
     app_.reset(new ShellConnection(this, std::move(request)));
   }
 
   // Overridden from ShellClient:
   bool AcceptConnection(Connection* connection) override {
-    connection->AddService<Validator>(this);
+    connection->AddInterface<Validator>(this);
     return true;
   }
 
   // Overridden from InterfaceFactory<Validator>:
   void Create(Connection* connection,
               InterfaceRequest<Validator> request) override {
     validator_bindings_.AddBinding(this, std::move(request));
   }
 
   // Overridden from Validator:
@@ skipping 68 matching lines @@
   void Create(Connection* connection,
               InterfaceRequest<Unsafe> request) override {
     unsafe_bindings_.AddBinding(this, std::move(request));
   }
 
   template <typename Interface>
   void AddService(Connection* connection) {
     validator_->AddServiceCalled(connection->GetRemoteApplicationURL(),
                                  connection->GetConnectionURL(),
                                  Interface::Name_,
-                                 !connection->AddService<Interface>(this));
+                                 !connection->AddInterface<Interface>(this));
   }
 
   Shell* shell_;
   ValidatorPtr validator_;
   WeakBindingSet<Safe> safe_bindings_;
   WeakBindingSet<Unsafe> unsafe_bindings_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceApplication);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // TestApplication:
 
 TestApplication::TestApplication() : shell_(nullptr) {}
 TestApplication::~TestApplication() {}
 
 void TestApplication::Initialize(Shell* shell, const std::string& url,
                                  uint32_t id) {
   shell_ = shell;
   url_ = url;
 }
 bool TestApplication::AcceptConnection(Connection* connection) {
   // TestApplications receive their Validator via the inbound connection.
-  connection->ConnectToService(&validator_);
+  connection->GetInterface(&validator_);
 
   connection1_ = shell_->Connect("test:service");
   connection1_->SetRemoteServiceProviderConnectionErrorHandler(
       base::Bind(&TestApplication::ConnectionClosed,
                   base::Unretained(this), "test:service"));
 
   connection2_ = shell_->Connect("test:service2");
   connection2_->SetRemoteServiceProviderConnectionErrorHandler(
       base::Bind(&TestApplication::ConnectionClosed,
                   base::Unretained(this), "test:service2"));
@@ skipping 161 matching lines @@
 void CapabilityFilterTest::RunTest() {
   loop()->Run();
   EXPECT_TRUE(validator_->expectations_met());
   if (!validator_->expectations_met())
     validator_->PrintUnmetExpectations();
 }
 
 }  // namespace test
 }  // namespace shell
 }  // namespace mojo