A new WM bootstrap flow

mojo/services/view_manager/view_manager_init_service_impl.h

Index: mojo/services/view_manager/view_manager_init_service_impl.h
diff --git a/mojo/services/view_manager/view_manager_init_service_impl.h b/mojo/services/view_manager/view_manager_init_service_impl.h
index f659df98a366bffeefc9c92a09a1b5d7efeb0118..a10af10d6909f51eb7b586949759b147cf3ddf3b 100644
--- a/mojo/services/view_manager/view_manager_init_service_impl.h
+++ b/mojo/services/view_manager/view_manager_init_service_impl.h
@@ -12,7 +12,6 @@
 #include "base/memory/scoped_vector.h"
 #include "mojo/services/public/interfaces/view_manager/view_manager.mojom.h"
 #include "mojo/services/view_manager/root_node_manager.h"
-#include "mojo/services/view_manager/root_view_manager_delegate.h"
 #include "mojo/services/view_manager/view_manager_export.h"
 
 namespace mojo {
@@ -23,6 +22,8 @@ class ServiceProvider;
 namespace view_manager {
 namespace service {
 
+class ViewManagerInitServiceContext;
+
 #if defined(OS_WIN)
 // Equivalent of NON_EXPORTED_BASE which does not work with the template snafu
 // below.
@@ -33,12 +34,16 @@ namespace service {
 // Used to create the initial ViewManagerClient. Doesn't initiate the Connect()
 // until the WindowTreeHost has been created.
 class MOJO_VIEW_MANAGER_EXPORT ViewManagerInitServiceImpl
-    : public InterfaceImpl<ViewManagerInitService>,
-      public RootViewManagerDelegate {
+    : public InterfaceImpl<ViewManagerInitService> {
  public:
-  explicit ViewManagerInitServiceImpl(ApplicationConnection* connection);
+  ViewManagerInitServiceImpl(ApplicationConnection* connection,
+                             ViewManagerInitServiceContext* context);
   virtual ~ViewManagerInitServiceImpl();
 
+  void OnNativeViewportDeleted();
+
+  void OnRootViewManagerWindowTreeHostCreated();
+
  private:
   struct ConnectParams {
     ConnectParams();
@@ -54,15 +59,10 @@ class MOJO_VIEW_MANAGER_EXPORT ViewManagerInitServiceImpl
   virtual void Embed(const String& url,
                      const Callback<void(bool)>& callback) OVERRIDE;
 
-  // RootViewManagerDelegate overrides:
-  virtual void OnRootViewManagerWindowTreeHostCreated() OVERRIDE;
-
-  void OnNativeViewportDeleted();
+  ViewManagerInitServiceContext* context_;
 
   ServiceProvider* service_provider_;
 
-  RootNodeManager root_node_manager_;
-
   // Stores information about inbound calls to Embed() pending execution on
   // the window tree host being ready to use.
   ScopedVector<ConnectParams> connect_params_;