Make Mozart view manager use the new compositor.

services/ui/view_manager/view_manager_app.h

Index: services/ui/view_manager/view_manager_app.h
diff --git a/services/ui/view_manager/view_manager_app.h b/services/ui/view_manager/view_manager_app.h
index ca37dea758e3d9f53f54b3e5474758bd41ceae45..96cbab4359e9d35dbbc84be4e2e8c9b778af324f 100644
--- a/services/ui/view_manager/view_manager_app.h
+++ b/services/ui/view_manager/view_manager_app.h
@@ -8,12 +8,11 @@
 #include <memory>
 
 #include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
 #include "mojo/common/strong_binding_set.h"
 #include "mojo/common/tracing_impl.h"
 #include "mojo/public/cpp/application/application_delegate.h"
+#include "mojo/services/gfx/composition/interfaces/compositor.mojom.h"
 #include "mojo/services/ui/views/interfaces/view_manager.mojom.h"
-#include "services/ui/view_manager/surface_manager.h"
 #include "services/ui/view_manager/view_registry.h"
 
 namespace view_manager {
@@ -35,12 +34,16 @@ class ViewManagerApp : public mojo::ApplicationDelegate,
   void Create(mojo::ApplicationConnection* connection,
               mojo::InterfaceRequest<mojo::ui::ViewManager> request) override;
 
+  void OnCompositorConnectionError();
+  void OnAssociateConnectionError(const std::string& url);
+
+  void Shutdown();
+
   mojo::ApplicationImpl* app_impl_;
   mojo::TracingImpl tracing_;
 
-  mojo::StrongBindingSet<mojo::ui::ViewManager> view_managers;
+  mojo::StrongBindingSet<mojo::ui::ViewManager> view_managers_;
   std::unique_ptr<ViewRegistry> registry_;
-  std::unique_ptr<SurfaceManager> surface_manager_;  // must come after registry
 
   DISALLOW_COPY_AND_ASSIGN(ViewManagerApp);
 };