Pass ServiceProvider thru ViewManagerService::Embed() allowing embedder & embeddee to expose servic…

mojo/services/view_manager/root_node_manager.h

Index: mojo/services/view_manager/root_node_manager.h
diff --git a/mojo/services/view_manager/root_node_manager.h b/mojo/services/view_manager/root_node_manager.h
index c785c2d6c1ab8a428559a8c2a7ae06a4ecf79486..e09b0364cb9f4b2d4db9718439fcbb1833b6bf87 100644
--- a/mojo/services/view_manager/root_node_manager.h
+++ b/mojo/services/view_manager/root_node_manager.h
@@ -83,13 +83,15 @@ class MOJO_VIEW_MANAGER_EXPORT RootNodeManager
 
   // Establishes the initial client. Similar to Connect(), but the resulting
   // client is allowed to do anything.
-  void EmbedRoot(const std::string& url);
+  void EmbedRoot(const std::string& url,
+                 InterfaceRequest<ServiceProvider> service_provider);
 
   // See description of ViewManagerService::Embed() for details. This assumes
   // |transport_node_id| is valid.
   void Embed(ConnectionSpecificId creator_id,
              const String& url,
-             Id transport_node_id);
+             Id transport_node_id,
+             InterfaceRequest<ServiceProvider> service_provider);
 
   // Returns the connection by id.
   ViewManagerServiceImpl* GetConnection(ConnectionSpecificId connection_id);
@@ -176,9 +178,11 @@ class MOJO_VIEW_MANAGER_EXPORT RootNodeManager
   }
 
   // Implementation of the two embed variants.
-  ViewManagerServiceImpl* EmbedImpl(ConnectionSpecificId creator_id,
-                                    const String& url,
-                                    const NodeId& root_id);
+  ViewManagerServiceImpl* EmbedImpl(
+      ConnectionSpecificId creator_id,
+      const String& url,
+      const NodeId& root_id,
+      InterfaceRequest<ServiceProvider> service_provider);
 
   // Overridden from NodeDelegate:
   virtual void OnNodeDestroyed(const Node* node) OVERRIDE;