Make Mozart view manager use the new compositor.

services/ui/input_manager/input_manager_app.cc

Index: services/ui/input_manager/input_manager_app.cc
diff --git a/services/gfx/compositor/compositor_app.cc b/services/ui/input_manager/input_manager_app.cc
similarity index 55%
copy from services/gfx/compositor/compositor_app.cc
copy to services/ui/input_manager/input_manager_app.cc
index 5fd8a9a1189444454403a788616230a9a984ccfd..9c5db147a5824cb6f80353ffc8597dbe752a44c6 100644
--- a/services/gfx/compositor/compositor_app.cc
+++ b/services/ui/input_manager/input_manager_app.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "services/gfx/compositor/compositor_app.h"
+#include "services/ui/input_manager/input_manager_app.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ -12,15 +12,15 @@
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/cpp/application/application_impl.h"
-#include "services/gfx/compositor/compositor_impl.h"
+#include "services/ui/input_manager/input_associate.h"
 
-namespace compositor {
+namespace input_manager {
 
-CompositorApp::CompositorApp() : app_impl_(nullptr) {}
+InputManagerApp::InputManagerApp() : app_impl_(nullptr) {}
 
-CompositorApp::~CompositorApp() {}
+InputManagerApp::~InputManagerApp() {}
 
-void CompositorApp::Initialize(mojo::ApplicationImpl* app_impl) {
+void InputManagerApp::Initialize(mojo::ApplicationImpl* app_impl) {
   app_impl_ = app_impl;
 
   auto command_line = base::CommandLine::ForCurrentProcess();
@@ -29,22 +29,19 @@ void CompositorApp::Initialize(mojo::ApplicationImpl* app_impl) {
   settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
   logging::InitLogging(settings);
 
-  tracing_.Initialize(app_impl_);
-
-  engine_.reset(new CompositorEngine());
+  tracing_.Initialize(app_impl);
 }
 
-bool CompositorApp::ConfigureIncomingConnection(
+bool InputManagerApp::ConfigureIncomingConnection(
     mojo::ApplicationConnection* connection) {
-  connection->AddService<mojo::gfx::composition::Compositor>(this);
+  connection->AddService<mojo::ui::ViewAssociate>(this);
   return true;
 }
 
-void CompositorApp::Create(
+void InputManagerApp::Create(
     mojo::ApplicationConnection* connection,
-    mojo::InterfaceRequest<mojo::gfx::composition::Compositor> request) {
-  compositor_bindings_.AddBinding(new CompositorImpl(engine_.get()),
-                                  request.Pass());
+    mojo::InterfaceRequest<mojo::ui::ViewAssociate> request) {
+  input_associates.AddBinding(new InputAssociate(), request.Pass());
 }
 
-}  // namespace compositor
+}  // namespace input_manager