First cut at "content handling" support in Mojo.

mojo/service_manager/service_manager.h

Index: mojo/service_manager/service_manager.h
diff --git a/mojo/service_manager/service_manager.h b/mojo/service_manager/service_manager.h
index 8809e86715386a84b560d67371f53a5c905f3b16..4246e786c80b645938f45db6671d5af4c024238e 100644
--- a/mojo/service_manager/service_manager.h
+++ b/mojo/service_manager/service_manager.h
@@ -10,6 +10,7 @@
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/memory/weak_ptr.h"
 #include "mojo/public/interfaces/service_provider/service_provider.mojom.h"
 #include "mojo/service_manager/service_loader.h"
 #include "mojo/service_manager/service_manager_export.h"
@@ -87,10 +88,30 @@ class MOJO_SERVICE_MANAGER_EXPORT ServiceManager {
   void TerminateShellConnections();
 
  private:
+  struct ContentHandlerConnection;
+  class LoadServiceCallbacksImpl;
   class ShellImpl;
+
   typedef std::map<std::string, ServiceLoader*> SchemeToLoaderMap;
   typedef std::map<GURL, ServiceLoader*> URLToLoaderMap;
   typedef std::map<GURL, ShellImpl*> URLToShellImplMap;
+  typedef std::map<GURL, ContentHandlerConnection*> ContentHandlerMap;

[DaveMoore, 2014/08/04 21:50:51]

Nit: We should have consistent naming of the types. This would be
URLToContentHandlerMap.

[Aaron Boodman, 2014/08/05 05:44:53]

Done.

+
+  void ConnectToClient(ShellImpl* shell_impl,
+                       const GURL& url,
+                       const GURL& requestor_url,
+                       ServiceProviderPtr service_provider);
+
+  void RegisterLoadedApplication(const GURL& service_url,
+                                 const GURL& requestor_url,
+                                 ServiceProviderPtr service_provider,
+                                 ScopedMessagePipeHandle* shell_handle);
+
+  void LoadWithContentHandler(const GURL& content_url,
+                              const GURL& requestor_url,
+                              const GURL& content_handler_url,
+                              URLResponsePtr content,
+                              ServiceProviderPtr service_provider);
 
   // Returns the Loader to use for a url (using default if not overridden.)
   // The preference is to use a loader that's been specified for an url first,
@@ -107,6 +128,9 @@ class MOJO_SERVICE_MANAGER_EXPORT ServiceManager {
   Interceptor* interceptor_;
 
   URLToShellImplMap url_to_shell_impl_;
+  ContentHandlerMap content_handlers_;

[DaveMoore, 2014/08/04 21:50:51]

Nit: url_to_content_handler_

[Aaron Boodman, 2014/08/05 05:44:53]

Done.

+
+  base::WeakPtrFactory<ServiceManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceManager);
 };