Rename ServiceProvider to InterfaceProvider.

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"
 #include "base/strings/stringprintf.h"
 #include "mojo/common/weak_binding_set.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "mojo/shell/application_loader.h"
 #include "mojo/shell/package_manager.h"
 #include "mojo/shell/public/cpp/connection.h"
 #include "mojo/shell/public/cpp/interface_factory.h"
 #include "mojo/shell/public/cpp/shell_connection.h"
 
 namespace mojo {
 namespace shell {
 namespace test {
 
 // Lives on the main thread of the test.
-// Listens for services exposed/blocked and for application connections being
+// Listens for interfaces exposed/blocked and for application connections being
 // closed. Quits |loop| when all expectations are met.
 class ConnectionValidator : public ApplicationLoader,
                             public ShellClient,
                             public InterfaceFactory<Validator>,
                             public Validator {
  public:
   ConnectionValidator(const std::set<std::string>& expectations,
                       base::MessageLoop* loop)
       : app_(nullptr),
         expectations_(expectations),
@@ skipping 24 matching lines @@
     return true;
   }
 
   // Overridden from InterfaceFactory<Validator>:
   void Create(Connection* connection,
               InterfaceRequest<Validator> request) override {
     validator_bindings_.AddBinding(this, std::move(request));
   }
 
   // Overridden from Validator:
-  void AddServiceCalled(const String& app_url,
-                        const String& service_url,
-                        const String& name,
-                        bool blocked) override {
+  void AddInterfaceCalled(const String& app_url,
+                          const String& service_url,
+                          const String& name,
+                          bool blocked) override {
     Validate(base::StringPrintf("%s %s %s %s",
         blocked ? "B" : "E", app_url.data(), service_url.data(), name.data()));
   }
   void ConnectionClosed(const String& app_url,
                         const String& service_url) override {
     Validate(base::StringPrintf("C %s %s", app_url.data(), service_url.data()));
   }
 
   void Validate(const std::string& result) {
     DVLOG(1) << "Validate: " << result;
@@ skipping 32 matching lines @@
 
  private:
   // Overridden from ShellClient:
   void Initialize(Shell* shell, const std::string& url, uint32_t id) override {
     shell_ = shell;
     // ServiceApplications have no capability filter and can thus connect
     // directly to the validator application.
     shell_->ConnectToService("test:validator", &validator_);
   }
   bool AcceptConnection(Connection* connection) override {
-    AddService<Safe>(connection);
-    AddService<Unsafe>(connection);
+    AddInterface<Safe>(connection);
+    AddInterface<Unsafe>(connection);
     return true;
   }
 
   // Overridden from InterfaceFactory<Safe>:
   void Create(Connection* connection,
               InterfaceRequest<Safe> request) override {
     safe_bindings_.AddBinding(this, std::move(request));
   }
 
   // Overridden from InterfaceFactory<Unsafe>:
   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->AddInterface<Interface>(this));
+  void AddInterface(Connection* connection) {
+    validator_->AddInterfaceCalled(connection->GetRemoteApplicationURL(),
+                                   connection->GetConnectionURL(),
+                                   Interface::Name_,
+                                   !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->GetInterface(&validator_);
 
   connection1_ = shell_->Connect("test:service");
-  connection1_->SetRemoteServiceProviderConnectionErrorHandler(
+  connection1_->SetRemoteInterfaceProviderConnectionErrorHandler(
       base::Bind(&TestApplication::ConnectionClosed,
                   base::Unretained(this), "test:service"));
 
   connection2_ = shell_->Connect("test:service2");
-  connection2_->SetRemoteServiceProviderConnectionErrorHandler(
+  connection2_->SetRemoteInterfaceProviderConnectionErrorHandler(
       base::Bind(&TestApplication::ConnectionClosed,
                   base::Unretained(this), "test:service2"));
   return true;
 }
 
 void TestApplication::ConnectionClosed(const std::string& service_url) {
   validator_->ConnectionClosed(url_, service_url);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 93 matching lines @@
   application_manager_.reset(
       new ApplicationManager(make_scoped_ptr(CreatePackageManager())));
   CreateLoader<ServiceApplication>("test:service");
   CreateLoader<ServiceApplication>("test:service2");
 }
 
 void CapabilityFilterTest::TearDown() {
   application_manager_.reset();
 }
 
-class ServiceProviderImpl : public ServiceProvider {
+class InterfaceProviderImpl : public InterfaceProvider {
  public:
-  explicit ServiceProviderImpl(
-      InterfaceRequest<ServiceProvider> service_provider,
+  explicit InterfaceProviderImpl(
+      InterfaceRequest<InterfaceProvider> interfaces,
       InterfaceFactory<Validator>* factory)
-      : binding_(this, std::move(service_provider)),
+      : binding_(this, std::move(interfaces)),
         factory_(factory) {}
-  ~ServiceProviderImpl() override {}
+  ~InterfaceProviderImpl() override {}
 
  private:
-  // ServiceProvider method.
-  void ConnectToService(const mojo::String& service_name,
-                        ScopedMessagePipeHandle client_handle) override {
-    if (service_name == Validator::Name_) {
+  // InterfaceProvider method.
+  void GetInterface(const mojo::String& interface_name,
+                    ScopedMessagePipeHandle client_handle) override {
+    if (interface_name == Validator::Name_) {
       factory_->Create(nullptr,
                        MakeRequest<Validator>(std::move(client_handle)));
     }
   }
 
-  Binding<ServiceProvider> binding_;
+  Binding<InterfaceProvider> binding_;
   InterfaceFactory<Validator>* factory_;
 
-  DISALLOW_COPY_AND_ASSIGN(ServiceProviderImpl);
+  DISALLOW_COPY_AND_ASSIGN(InterfaceProviderImpl);
 };
 
 void CapabilityFilterTest::RunApplication(const std::string& url,
                                           const CapabilityFilter& filter) {
-  ServiceProviderPtr services;
+  InterfaceProviderPtr remote_interfaces;
 
   // We expose Validator to the test application via ConnectToApplication
   // because we don't allow the test application to connect to test:validator.
   // Adding it to the CapabilityFilter would interfere with the test.
-  ServiceProviderPtr exposed_services;
-  new ServiceProviderImpl(GetProxy(&exposed_services), validator_);
+  InterfaceProviderPtr local_interfaces;
+  new InterfaceProviderImpl(GetProxy(&local_interfaces), validator_);
   scoped_ptr<ConnectToApplicationParams> params(
       new ConnectToApplicationParams);
   params->SetTarget(Identity(GURL(url), std::string(), filter));
-  params->set_services(GetProxy(&services));
-  params->set_exposed_services(std::move(exposed_services));
+  params->set_remote_interfaces(GetProxy(&remote_interfaces));
+  params->set_local_interfaces(std::move(local_interfaces));
   params->set_on_application_end(base::MessageLoop::QuitWhenIdleClosure());
   application_manager_->ConnectToApplication(std::move(params));
 }
 
 void CapabilityFilterTest::InitValidator(
     const std::set<std::string>& expectations) {
   validator_ = new ConnectionValidator(expectations, &loop_);
   application_manager()->SetLoaderForURL(make_scoped_ptr(validator_),
                                           GURL("test:validator"));
 }
 
 void CapabilityFilterTest::RunTest() {
   loop()->Run();
   EXPECT_TRUE(validator_->expectations_met());
   if (!validator_->expectations_met())
     validator_->PrintUnmetExpectations();
 }
 
 }  // namespace test
 }  // namespace shell
 }  // namespace mojo