Rename ServiceProvider to InterfaceProvider.

mojo/shell/public/cpp/shell_connection.h

Index: mojo/shell/public/cpp/shell_connection.h
diff --git a/mojo/shell/public/cpp/shell_connection.h b/mojo/shell/public/cpp/shell_connection.h
index c58150a8c4341dd767e3666175e8aa530ead28b6..fbaf973f9290adb27769b2d564b181cc73c5ee39 100644
--- a/mojo/shell/public/cpp/shell_connection.h
+++ b/mojo/shell/public/cpp/shell_connection.h
@@ -102,8 +102,8 @@ class ShellConnection : public Shell, public shell::mojom::ShellClient {
                   uint32_t id) override;
   void AcceptConnection(const String& requestor_url,
                         uint32_t requestor_id,
-                        InterfaceRequest<ServiceProvider> services,
-                        ServiceProviderPtr exposed_services,
+                        InterfaceRequest<InterfaceProvider> remote_interfaces,
+                        InterfaceProviderPtr local_interfaces,
                         Array<String> allowed_interfaces,
                         const String& url) override;
   void OnQuitRequested(const Callback<void(bool)>& callback) override;