Use ui::Event instead of mojom::EventPtr in mus::InputEventHandler.

components/mus/public/cpp/tests/window_tree_client_impl_unittest.cc

 // Copyright 2015 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/public/cpp/lib/window_tree_client_impl.h"
 
 #include <stdint.h>
 
 #include "base/logging.h"
 #include "base/macros.h"
@@ skipping 122 matching lines @@
   void Reset() {
     received_event_ = false;
     ack_callback_ = base::Bind(&::DoNothingBool);
   }
   bool received_event() const { return received_event_; }
 
  private:
   // InputEventHandler:
   void OnWindowInputEvent(
       Window* target,
-      mojom::EventPtr event,
+      const ui::Event& event,
       scoped_ptr<base::Callback<void(bool)>>* ack_callback) override {
     EXPECT_FALSE(received_event_)
         << "Observer was not reset after receiving event.";
     received_event_ = true;
     if (should_manually_ack_) {
       ack_callback_ = *ack_callback->get();
       ack_callback->reset();
     }
   }
 
@@ skipping 188 matching lines @@
   WindowTreeSetup setup;
   Window* root = setup.GetFirstRoot();
   ASSERT_TRUE(root);
 
   TestInputEventHandler event_handler;
   root->set_input_event_handler(&event_handler);
 
   scoped_ptr<ui::Event> ui_event(
       new ui::MouseEvent(ui::ET_MOUSE_MOVED, gfx::Point(), gfx::Point(),
                          ui::EventTimeForNow(), ui::EF_NONE, 0));
-  mojom::EventPtr mus_event = mojom::Event::From(*ui_event);
-  setup.window_tree_client()->OnWindowInputEvent(1, root->id(),
-                                                 std::move(mus_event));
+  setup.window_tree_client()->OnWindowInputEvent(
+      1, root->id(), mojom::Event::From(*ui_event.get()));
   EXPECT_TRUE(event_handler.received_event());
   EXPECT_TRUE(setup.window_tree()->WasEventAcked(1));
   event_handler.Reset();
 
   event_handler.set_should_manually_ack();
-  mus_event = mojom::Event::From(*ui_event);
-  setup.window_tree_client()->OnWindowInputEvent(33, root->id(),
-                                                 std::move(mus_event));
+  setup.window_tree_client()->OnWindowInputEvent(
+      33, root->id(), mojom::Event::From(*ui_event.get()));
   EXPECT_TRUE(event_handler.received_event());
   EXPECT_FALSE(setup.window_tree()->WasEventAcked(33));
 
   event_handler.AckEvent();
   EXPECT_TRUE(setup.window_tree()->WasEventAcked(33));
 }
 
 // Verifies focus is reverted if the server replied that the change failed.
 TEST_F(WindowTreeClientImplTest, SetFocusFailed) {
   WindowTreeSetup setup;
@@ skipping 431 matching lines @@
 
   setup.window_tree_client()->OnChangeCompleted(change_id2, false);
   EXPECT_FALSE(child->HasCapture());
   EXPECT_TRUE(root->HasCapture());
 
   setup.window_tree_client()->OnLostCapture(root->id());
   EXPECT_FALSE(root->HasCapture());
 }
 
 }  // namespace mus