Mojo JS Bindings: Simplify sharing services for content-provided JS applications

mojo/apps/js/application_delegate_impl.h

Index: mojo/apps/js/application_delegate_impl.h
diff --git a/mojo/apps/js/application_delegate_impl.h b/mojo/apps/js/application_delegate_impl.h
index 81a481cd356bc3a76be815561d7a17358c8693af..9098c03b2065caa0f095d298719fc90edca65af9 100644
--- a/mojo/apps/js/application_delegate_impl.h
+++ b/mojo/apps/js/application_delegate_impl.h
@@ -8,7 +8,9 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "mojo/public/cpp/application/application_delegate.h"
+#include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/public/cpp/system/message_pipe.h"
+#include "mojo/public/interfaces/application/service_provider.mojom.h"
 
 namespace mojo {
 
@@ -37,9 +39,9 @@ class ApplicationDelegateImpl : public ApplicationDelegate {
   // Remove app from the AppVector; destroys the app.
   void QuitJSApp(JSApp *app);
 
-  void ConnectToService(ScopedMessagePipeHandle pipe_handle,
-                        const std::string& application_url,
-                        const std::string& interface_name);
+  // Use the shell to connect to a ServiceProvider for application_url.
+  void ConnectToApplication(const std::string& application_url,
+                            InterfaceRequest<ServiceProvider> request);
 
  protected:
   // ApplicationDelegate:
@@ -47,7 +49,7 @@ class ApplicationDelegateImpl : public ApplicationDelegate {
 
  private:
   typedef ScopedVector<JSApp> AppVector;
-  ApplicationImpl* application_impl_;
+  ApplicationImpl* application_impl_;  // Owns the shell used by all JSApps.
   AppVector app_vector_;
 };