mash: Don't synthesize extra key press events in the window server

services/ui/ws/platform_display_default.h

Index: services/ui/ws/platform_display_default.h
diff --git a/services/ui/ws/platform_display_default.h b/services/ui/ws/platform_display_default.h
index 86e43ab23e1ed4391699d7358091814fa7f8a3a0..3c7d59021513bc05f6a6035f0824f438685a30f8 100644
--- a/services/ui/ws/platform_display_default.h
+++ b/services/ui/ws/platform_display_default.h
@@ -29,8 +29,10 @@ namespace ws {
 class PlatformDisplayDefault : public PlatformDisplay,
                                public ui::PlatformWindowDelegate {
  public:
+  // |image_cursors| may be null, for example on Android or in tests.
   PlatformDisplayDefault(ServerWindow* root_window,
-                         const display::ViewportMetrics& metrics);
+                         const display::ViewportMetrics& metrics,
+                         std::unique_ptr<ImageCursors> image_cursors);
   ~PlatformDisplayDefault() override;
 
   // EventSource::
@@ -72,9 +74,7 @@ class PlatformDisplayDefault : public PlatformDisplay,
 
   ServerWindow* root_window_;
 
-#if !defined(OS_ANDROID)

[James Cook, 2017/03/31 23:31:20]

Lemme know if you want me to keep these ifdefs. I think ImageCursors is compiled
on Android, so leaving it null seemed a little better than keeping it ifdef-y.

   std::unique_ptr<ui::ImageCursors> image_cursors_;
-#endif
 
   PlatformDisplayDelegate* delegate_ = nullptr;
   std::unique_ptr<FrameGenerator> frame_generator_;