Rename ServiceProvider to InterfaceProvider.

mojo/shell/public/interfaces/shell_client.mojom

 // 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.
 
 module mojo.shell.mojom;
 
-import "mojo/shell/public/interfaces/service_provider.mojom";
+import "mojo/shell/public/interfaces/interface_provider.mojom";
 import "mojo/shell/public/interfaces/shell.mojom";
 
 // TODO(beng): rewrite these comments.
 // This is the primary interface implemented by every Mojo application. It
 // allows the application to receive its startup arguments from the shell, and
 // to be notified of events that occur during its execution.
 //
 // TODO(aa): It would be good to reorder the parameters once we have interface
 // versioning.
 interface ShellClient {
@@ skipping 11 matching lines @@
   // ApplicationManager. It can be passed to other shell interfaces that request
   // an instance identifier.
   Initialize(Shell shell, string url, uint32 id);
 
   // Called when another application (identified by |requestor_url|) attempts to
   // open a connection to this application.
   //
   // If the other application wants to request services from this application,
   // it will have passed a valid interface request through the |services|
   // parameter (i.e. one containing a valid message pipe endpoint). This
-  // application may then bind an implementation of |ServiceProvider| to that
+  // application may then bind an implementation of |InterfaceProvider| to that
   // request in order to make services available to the other application.
   //
   // If the other application wants to offer services to this application, it
   // will have passed a bound interface through the |exposed_services|
   // parameter. This application may then request services through that
   // interface.
   //
   // It is possible that both parameters will be valid/bound if the other
   // application wants to both request services from and offer services to this
   // application.
   //
   // This application is free to ignore the |services| or |exposed_services|
   // parameters if it does not wish to offer or request services.
   //
   // |allowed_interfaces| is a set of interface names that the shell has
   // determined can be exposed by this application to the connecting
   // application. When this parameter is empty, this application should expose
   // no services to the connecting application. When this parameter contains
   // only the single string value "*" the application may expose all of its
   // services to the connecting application.
   //
   // |resolved_url| is the URL that was requested to create this connection,
   // after all mappings, resolutions, and redirects. This will include any
   // querystring that was part of the request.
   //
   AcceptConnection(string requestor_url,
                    uint32 requestor_id,
-                   mojo.ServiceProvider&? services,
-                   mojo.ServiceProvider? exposed_services,
+                   mojo.InterfaceProvider&? local_interfaces,
+                   mojo.InterfaceProvider? remote_interfaces,
                    array<string> allowed_interfaces,
                    string resolved_url);
 
   // Called by the shell in response to calling Shell's QuitApplication. The
   // application should run the callback with true if shutdown can proceed.
   // See Shell::QuitApplication for details about shutdown workflow.
   OnQuitRequested() => (bool can_quit);
 };