Rename ServiceProvider to InterfaceProvider.

mojo/shell/public/cpp/lib/shell_connection.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 <algorithm>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "mojo/converters/network/network_type_converters.h"
@@ skipping 55 matching lines @@
   ConnectParams params(url);
   params.set_filter(CreatePermissiveCapabilityFilter());
   return Connect(&params);
 }
 
 scoped_ptr<Connection> ShellConnection::Connect(ConnectParams* params) {
   if (!shell_)
     return nullptr;
   DCHECK(params);
   URLRequestPtr request = params->TakeRequest();
-  ServiceProviderPtr local_services;
-  InterfaceRequest<ServiceProvider> local_request = GetProxy(&local_services);
-  ServiceProviderPtr remote_services;
   std::string application_url = request->url.To<std::string>();
   // We allow all interfaces on outgoing connections since we are presumably in
   // a position to know who we're talking to.
   // TODO(beng): is this a valid assumption or do we need to figure some way to
   //             filter here too?
   std::set<std::string> allowed;
   allowed.insert("*");
-  InterfaceRequest<ServiceProvider> remote_services_proxy =
-      GetProxy(&remote_services);
+  InterfaceProviderPtr local_interfaces;
+  InterfaceRequest<InterfaceProvider> local_request =
+      GetProxy(&local_interfaces);
+  InterfaceProviderPtr remote_interfaces;
+  InterfaceRequest<InterfaceProvider> remote_request =
+      GetProxy(&remote_interfaces);
   scoped_ptr<internal::ConnectionImpl> registry(new internal::ConnectionImpl(
       application_url, application_url,
-      shell::mojom::Shell::kInvalidApplicationID, std::move(remote_services),
+      shell::mojom::Shell::kInvalidApplicationID, std::move(remote_interfaces),
       std::move(local_request), allowed));
   shell_->ConnectToApplication(std::move(request),
-                               std::move(remote_services_proxy),
-                               std::move(local_services), params->TakeFilter(),
+                               std::move(remote_request),
+                               std::move(local_interfaces),
+                               params->TakeFilter(),
                                registry->GetConnectToApplicationCallback());
   return std::move(registry);
 }
 
 void ShellConnection::Quit() {
   // We can't quit immediately, since there could be in-flight requests from the
   // shell. So check with it first.
   if (shell_) {
     quit_requested_ = true;
     shell_->QuitApplication();
@@ skipping 10 matching lines @@
                                  const mojo::String& url,
                                  uint32_t id) {
   shell_ = std::move(shell);
   shell_.set_connection_error_handler([this]() { OnConnectionError(); });
   client_->Initialize(this, url, id);
 }
 
 void ShellConnection::AcceptConnection(
     const String& requestor_url,
     uint32_t requestor_id,
-    InterfaceRequest<ServiceProvider> services,
-    ServiceProviderPtr exposed_services,
+    InterfaceRequest<InterfaceProvider> local_interfaces,
+    InterfaceProviderPtr remote_interfaces,
     Array<String> allowed_interfaces,
     const String& url) {
   scoped_ptr<Connection> registry(new internal::ConnectionImpl(
-      url, requestor_url, requestor_id, std::move(exposed_services),
-      std::move(services), allowed_interfaces.To<std::set<std::string>>()));
+      url, requestor_url, requestor_id, std::move(remote_interfaces),
+      std::move(local_interfaces),
+      allowed_interfaces.To<std::set<std::string>>()));
   if (!client_->AcceptConnection(registry.get()))
     return;
 
-  // If we were quitting because we thought there were no more services for this
-  // app in use, then that has changed so cancel the quit request.
+  // If we were quitting because we thought there were no more interfaces for
+  // this app in use, then that has changed so cancel the quit request.
   if (quit_requested_)
     quit_requested_ = false;
 
   incoming_connections_.push_back(std::move(registry));
 }
 
 void ShellConnection::OnQuitRequested(const Callback<void(bool)>& callback) {
   // If by the time we got the reply from the shell, more requests had come in
   // then we don't want to quit the app anymore so we return false. Otherwise
   // |quit_requested_| is true so we tell the shell to proceed with the quit.
@@ skipping 32 matching lines @@
 shell::mojom::CapabilityFilterPtr CreatePermissiveCapabilityFilter() {
   shell::mojom::CapabilityFilterPtr filter(
       shell::mojom::CapabilityFilter::New());
   Array<String> all_interfaces;
   all_interfaces.push_back("*");
   filter->filter.insert("*", std::move(all_interfaces));
   return filter;
 }
 
 }  // namespace mojo