Shell / ShellClient -> ServiceProvider

mojo/public/interfaces/service_provider/service_provider.mojom

Index: mojo/public/interfaces/service_provider/service_provider.mojom
diff --git a/mojo/public/interfaces/shell/shell.mojom b/mojo/public/interfaces/service_provider/service_provider.mojom
similarity index 62%
rename from mojo/public/interfaces/shell/shell.mojom
rename to mojo/public/interfaces/service_provider/service_provider.mojom
index e5f6c39cbb9c8dd54ec4032d2387d34db0476615..c2deca6a086092728f771a6220f635ee6cedac6e 100644
--- a/mojo/public/interfaces/shell/shell.mojom
+++ b/mojo/public/interfaces/service_provider/service_provider.mojom
@@ -4,15 +4,11 @@
 
 module mojo {
 
-[Client=ShellClient]
-interface Shell {
+[Client=ServiceProvider]
+interface ServiceProvider {
   // Loads url. mojo:{service} will result in the user of the value of the
   // --origin flag to the shell being used.
-  Connect(string url, handle<message_pipe> client_handle);
-};
-
-interface ShellClient {
-  AcceptConnection(string url, handle<message_pipe> client_handle);
+  ConnectToService(string url, handle<message_pipe> client_handle);
 };
 
 }