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

mojo/examples/demo_launcher/demo_launcher.cc

Index: mojo/examples/demo_launcher/demo_launcher.cc
diff --git a/mojo/examples/demo_launcher/demo_launcher.cc b/mojo/examples/demo_launcher/demo_launcher.cc
index 86a1b3db92032cd2d8329241cc8d96db01f6c929..f045d71ad8c075c3de688a938703e560ca69ab79 100644
--- a/mojo/examples/demo_launcher/demo_launcher.cc
+++ b/mojo/examples/demo_launcher/demo_launcher.cc
@@ -8,6 +8,8 @@
 #include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
+#include "mojo/public/cpp/application/service_provider_impl.h"
+#include "mojo/public/interfaces/application/service_provider.mojom.h"
 #include "mojo/services/public/interfaces/view_manager/view_manager.mojom.h"
 
 namespace mojo {
@@ -25,7 +27,9 @@ class DemoLauncher : public ApplicationDelegate {
 
   virtual bool ConfigureIncomingConnection(ApplicationConnection* connection)
       MOJO_OVERRIDE {
-    view_manager_init_->Embed("mojo:mojo_window_manager",
+    ServiceProviderPtr sp;
+    BindToProxy(new ServiceProviderImpl, &sp);
+    view_manager_init_->Embed("mojo:mojo_window_manager", sp.Pass(),
                               base::Bind(&DemoLauncher::OnConnect,
                                          base::Unretained(this)));
     return true;