Rename ServiceProvider to InterfaceProvider.

mojo/shell/connect_to_application_params.h

 // 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.
 
 #ifndef MOJO_SHELL_CONNECT_TO_APPLICATION_PARAMS_H_
 #define MOJO_SHELL_CONNECT_TO_APPLICATION_PARAMS_H_
 
 #include <string>
 #include <utility>
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/services/network/public/interfaces/url_loader.mojom.h"
 #include "mojo/shell/identity.h"
-#include "mojo/shell/public/interfaces/service_provider.mojom.h"
+#include "mojo/shell/public/interfaces/interface_provider.mojom.h"
 #include "mojo/shell/public/interfaces/shell.mojom.h"
 #include "url/gurl.h"
 
 namespace mojo {
 namespace shell {
 
 class ApplicationInstance;
 
 // This class represents a request for the application manager to connect to an
 // application.
@@ skipping 16 matching lines @@
   const Identity& target() const { return target_; }
 
   const URLRequest* target_url_request() const {
     return target_url_request_.get();
   }
   // NOTE: This doesn't reset |target_|.
   URLRequestPtr TakeTargetURLRequest() {
     return std::move(target_url_request_);
   }
 
-  void set_services(InterfaceRequest<ServiceProvider> value) {
-    services_ = std::move(value);
+  void set_remote_interfaces(InterfaceRequest<InterfaceProvider> value) {
+    remote_interfaces_ = std::move(value);
   }
-  InterfaceRequest<ServiceProvider> TakeServices() {
-    return std::move(services_);
+  InterfaceRequest<InterfaceProvider> TakeRemoteInterfaces() {
+    return std::move(remote_interfaces_);
   }
 
-  void set_exposed_services(ServiceProviderPtr value) {
-    exposed_services_ = std::move(value);
+  void set_local_interfaces(InterfaceProviderPtr value) {
+    local_interfaces_ = std::move(value);
   }
-  ServiceProviderPtr TakeExposedServices() {
-    return std::move(exposed_services_);
+  InterfaceProviderPtr TakeLocalInterfaces() {
+    return std::move(local_interfaces_);
   }
 
   void set_on_application_end(const base::Closure& value) {
     on_application_end_ = value;
   }
   const base::Closure& on_application_end() const {
     return on_application_end_;
   }
 
   void set_connect_callback(
       const shell::mojom::Shell::ConnectToApplicationCallback& value) {
     connect_callback_ = value;
   }
   const shell::mojom::Shell::ConnectToApplicationCallback&
       connect_callback() const {
     return connect_callback_;
   }
 
  private:
   // It may be null (i.e., is_null() returns true) which indicates that there is
   // no source (e.g., for the first application or in tests).
   Identity source_;
   // The identity of the application being connected to.
   Identity target_;
   // The URL request to fetch the application. It may contain more information
   // than |target_| (e.g., headers, request body). When it is taken, |target_|
   // remains unchanged.
   URLRequestPtr target_url_request_;
 
-  InterfaceRequest<ServiceProvider> services_;
-  ServiceProviderPtr exposed_services_;
+  InterfaceRequest<InterfaceProvider> remote_interfaces_;
+  InterfaceProviderPtr local_interfaces_;
   base::Closure on_application_end_;
   shell::mojom::Shell::ConnectToApplicationCallback connect_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(ConnectToApplicationParams);
 };
 
 }  // namespace shell
 }  // namespace mojo
 
 #endif  // MOJO_SHELL_CONNECT_TO_APPLICATION_PARAMS_H_