mustash: Use ui::chromeos::EventRewriter in mus

services/ui/ws/test_utils.h

 // Copyright 2016 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.
 
 #ifndef SERVICES_UI_WS_TEST_UTILS_H_
 #define SERVICES_UI_WS_TEST_UTILS_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 120 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(WindowTreeTestApi);
 };
 
 // -----------------------------------------------------------------------------
 
 class DisplayTestApi {
  public:
   explicit DisplayTestApi(Display* display);
   ~DisplayTestApi();
 
-  void OnEvent(const ui::Event& event) { display_->OnEvent(event); }
+  void OnEvent(const ui::Event& event) {
+    display_->OnEventFromSource(const_cast<ui::Event*>(&event));

[sky, 2017/03/20 15:42:12]

Same comment here about not casting away const.

[Peng, 2017/03/20 17:24:14]

Done.

+  }
 
   mojom::Cursor last_cursor() const { return display_->last_cursor_; }
 
  private:
   Display* display_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayTestApi);
 };
 
 // -----------------------------------------------------------------------------
@@ skipping 534 matching lines @@
 ServerWindow* NewWindowInTree(WindowTree* tree, ClientWindowId* client_id);
 ServerWindow* NewWindowInTreeWithParent(WindowTree* tree,
                                         ServerWindow* parent,
                                         ClientWindowId* client_id = nullptr);
 
 }  // namespace test
 }  // namespace ws
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_TEST_UTILS_H_