A new WM bootstrap flow

mojo/services/view_manager/main.cc

Index: mojo/services/view_manager/main.cc
diff --git a/mojo/services/view_manager/main.cc b/mojo/services/view_manager/main.cc
index d5115055fc772e4b47b3880458051c1d5eb02291..7c4a358d0968efad651315c86a10c0f3bb1fec08 100644
--- a/mojo/services/view_manager/main.cc
+++ b/mojo/services/view_manager/main.cc
@@ -4,6 +4,7 @@
 
 #include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/cpp/application/application_delegate.h"
+#include "mojo/services/view_manager/view_manager_init_service_context.h"
 #include "mojo/services/view_manager/view_manager_init_service_impl.h"
 
 namespace mojo {
@@ -17,13 +18,16 @@ class ViewManagerApp : public ApplicationDelegate {
 
   virtual bool ConfigureIncomingConnection(ApplicationConnection* connection)
       MOJO_OVERRIDE {
+    context_.ConfigureIncomingConnection(connection);
     // TODO(sky): this needs some sort of authentication as well as making sure
     // we only ever have one active at a time.
-    connection->AddService<ViewManagerInitServiceImpl>();
+    connection->AddService<ViewManagerInitServiceImpl>(&context_);
     return true;
   }
 
  private:
+  ViewManagerInitServiceContext context_;
+
   DISALLOW_COPY_AND_ASSIGN(ViewManagerApp);
 };