Enable InputDeviceServer/InputDeviceClient in mash.

components/mus/mus_app.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/mus/mus_app.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 162 matching lines @@
   DCHECK(ui::ClientNativePixmapFactory::GetInstance());
 #endif
 
 // TODO(rjkroege): Enter sandbox here before we start threads in GpuState
 // http://crbug.com/584532
 
 #if !defined(OS_ANDROID)
   event_source_ = ui::PlatformEventSource::CreateDefault();
 #endif
 
+  // This needs to happen after DeviceDataManager has been constructed. That
+  // happens either during OzonePlatform or PlatformEventSource initialization,
+  // so keep this line below both of those.
+  input_device_server_.RegisterAsObserver();
+
   if (use_chrome_gpu_command_buffer_) {
     GpuServiceMus::GetInstance();
   } else {
     // TODO(rjkroege): It is possible that we might want to generalize the
     // GpuState object.
     platform_display_init_params_.gpu_state = new GpuState();
   }
 
   // Gpu must be running before the PlatformScreen can be initialized.
   platform_screen_->Init();
@@ skipping 10 matching lines @@
   connection->AddInterface<mojom::WindowTreeFactory>(this);
   if (test_config_)
     connection->AddInterface<WindowServerTest>(this);
 
   if (use_chrome_gpu_command_buffer_) {
     connection->AddInterface<mojom::GpuService>(this);
   } else {
     connection->AddInterface<Gpu>(this);
   }
 
+  input_device_server_.RegisterInterface(connection);
+
   return true;
 }
 
 void MusApp::OnFirstDisplayReady() {
   PendingRequests requests;
   requests.swap(pending_requests_);
   for (auto& request : requests)
     Create(request->connection, std::move(*request->wtf_request));
 }
 
@@ skipping 95 matching lines @@
   platform_display_init_params_.display_bounds = bounds;
   platform_display_init_params_.display_id = id;
 
   // Display manages its own lifetime.
   ws::Display* host_impl =
       new ws::Display(window_server_.get(), platform_display_init_params_);
   host_impl->Init(nullptr);
 }
 
 }  // namespace mus