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

content/renderer/mus/compositor_mus_connection_unittest.cc

 // 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.
 
 #include "content/renderer/mus/compositor_mus_connection.h"
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/test/test_simple_task_runner.h"
 #include "base/time/time.h"
 #include "components/mus/public/cpp/tests/test_window.h"
 #include "components/mus/public/interfaces/input_event_constants.mojom.h"
 #include "components/mus/public/interfaces/input_events.mojom.h"
 #include "components/mus/public/interfaces/input_key_codes.mojom.h"
 #include "content/common/input/did_overscroll_params.h"
 #include "content/common/input/input_event_ack.h"
 #include "content/common/input/input_event_ack_state.h"
 #include "content/public/test/mock_render_thread.h"
 #include "content/renderer/input/input_handler_manager.h"
 #include "content/renderer/input/input_handler_manager_client.h"
 #include "content/renderer/input/render_widget_input_handler.h"
 #include "content/renderer/mus/render_widget_mus_connection.h"
 #include "content/renderer/render_widget.h"
 #include "content/test/fake_compositor_dependencies.h"
 #include "content/test/fake_renderer_scheduler.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/events/event_utils.h"
 
 namespace {
 
 // Wrapper for the callback provided to
 // CompositorMusConnection:OnWindowInputEvent. This tracks whether the it was
 // called, along with the result.
 class TestCallback : public base::RefCounted<TestCallback> {
  public:
   TestCallback() : called_(false), result_(false) {}
 
@@ skipping 161 matching lines @@
 namespace content {
 
 // Test suite for CompositorMusConnection, this does not setup a full renderer
 // environment. This does not establish a connection to a mus server, nor does
 // it initialize one.
 class CompositorMusConnectionTest : public testing::Test {
  public:
   CompositorMusConnectionTest() {}
   ~CompositorMusConnectionTest() override {}
 
-  // Initializes |event| with valid parameters for a key event, so that it can
-  // be converted to a web event by CompositorMusConnection.
-  void GenerateKeyEvent(mus::mojom::EventPtr& event);
+  // Returns a valid key event, so that it can be converted to a web event by
+  // CompositorMusConnection.
+  scoped_ptr<ui::Event> GenerateKeyEvent();
 
   // Calls CompositorMusConnection::OnWindowInputEvent.
   void OnWindowInputEvent(mus::Window* window,
-                          mus::mojom::EventPtr event,
+                          const ui::Event& event,
                           scoped_ptr<base::Callback<void(bool)>>* ack_callback);
 
   // Confirms the state of pending tasks enqueued on each task runner, and runs
   // until idle.
   void VerifyAndRunQueues(bool main_task_runner_enqueued,
                           bool compositor_task_runner_enqueued);
 
   CompositorMusConnection* compositor_connection() {
     return compositor_connection_.get();
   }
@@ skipping 29 matching lines @@
   // Actual CompositorMusConnection for testing.
   scoped_refptr<CompositorMusConnection> compositor_connection_;
 
   // Test implementations, to control input given to |compositor_connection_|.
   scoped_ptr<TestInputHandlerManager> input_handler_manager_;
   scoped_ptr<TestRenderWidgetInputHandler> render_widget_input_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(CompositorMusConnectionTest);
 };
 
-void CompositorMusConnectionTest::GenerateKeyEvent(
-    mus::mojom::EventPtr& event) {
-  event->action = mus::mojom::EventType::KEY_PRESSED;
-  event->time_stamp = base::TimeTicks::Now().ToInternalValue();
-  event->key_data = mus::mojom::KeyData::New();
-  event->key_data->is_char = true;
-  event->key_data->windows_key_code = mus::mojom::KeyboardCode::A;
+scoped_ptr<ui::Event> CompositorMusConnectionTest::GenerateKeyEvent() {
+  return scoped_ptr<ui::Event>(new ui::KeyEvent(
+      ui::ET_KEY_PRESSED, ui::KeyboardCode::VKEY_A, ui::EF_NONE));
 }
 
 void CompositorMusConnectionTest::OnWindowInputEvent(
     mus::Window* window,
-    mus::mojom::EventPtr event,
+    const ui::Event& event,
     scoped_ptr<base::Callback<void(bool)>>* ack_callback) {
-  compositor_connection_->OnWindowInputEvent(window, std::move(event),
-                                             ack_callback);
+  compositor_connection_->OnWindowInputEvent(window, event, ack_callback);
 }
 
 void CompositorMusConnectionTest::VerifyAndRunQueues(
     bool main_task_runner_enqueued,
     bool compositor_task_runner_enqueued) {
   // Run through the enqueued actions.
   EXPECT_EQ(main_task_runner_enqueued, main_task_runner_->HasPendingTask());
   main_task_runner_->RunUntilIdle();
 
   EXPECT_EQ(compositor_task_runner_enqueued,
@@ skipping 36 matching lines @@
 // Tests that for events which the renderer will ack, yet not consume, that
 // CompositorMusConnection consumes the ack during OnWindowInputEvent, and calls
 // it with the correct state once processed.
 TEST_F(CompositorMusConnectionTest, NotConsumed) {
   TestRenderWidgetInputHandler* input_handler = render_widget_input_handler();
   input_handler->set_delegate(connection());
   input_handler->set_state(
       InputEventAckState::INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
 
   mus::TestWindow test_window;
-  mus::mojom::EventPtr event = mus::mojom::Event::New();
-  GenerateKeyEvent(event);
+  scoped_ptr<ui::Event> event(GenerateKeyEvent());
   scoped_refptr<TestCallback> test_callback(new TestCallback);
   scoped_ptr<base::Callback<void(bool)>> ack_callback(
       new base::Callback<void(bool)>(
           base::Bind(&::TestCallback::BoolCallback, test_callback)));
 
-  OnWindowInputEvent(&test_window, std::move(event), &ack_callback);
+  OnWindowInputEvent(&test_window, *event.get(), &ack_callback);
   // OnWindowInputEvent is expected to clear the callback if it plans on
   // handling the ack.
   EXPECT_FALSE(ack_callback.get());
 
   VerifyAndRunQueues(true, true);
 
   // The ack callback should have been called
   EXPECT_TRUE(test_callback->called());
   EXPECT_FALSE(test_callback->result());
 }
 
 // Tests that for events which the renderer will ack, and consume, that
 // CompositorMusConnection consumes the ack during OnWindowInputEvent, and calls
 // it with the correct state once processed.
 TEST_F(CompositorMusConnectionTest, Consumed) {
   TestRenderWidgetInputHandler* input_handler = render_widget_input_handler();
   input_handler->set_delegate(connection());
   input_handler->set_state(InputEventAckState::INPUT_EVENT_ACK_STATE_CONSUMED);
 
   mus::TestWindow test_window;
-  mus::mojom::EventPtr event = mus::mojom::Event::New();
-  GenerateKeyEvent(event);
+  scoped_ptr<ui::Event> event(GenerateKeyEvent());
   scoped_refptr<TestCallback> test_callback(new TestCallback);
   scoped_ptr<base::Callback<void(bool)>> ack_callback(
       new base::Callback<void(bool)>(
           base::Bind(&::TestCallback::BoolCallback, test_callback)));
 
-  OnWindowInputEvent(&test_window, std::move(event), &ack_callback);
+  OnWindowInputEvent(&test_window, *event.get(), &ack_callback);
   // OnWindowInputEvent is expected to clear the callback if it plans on
   // handling the ack.
   EXPECT_FALSE(ack_callback.get());
 
   VerifyAndRunQueues(true, true);
 
   // The ack callback should have been called
   EXPECT_TRUE(test_callback->called());
   EXPECT_TRUE(test_callback->result());
 }
 
 // Tests that when the RenderWidgetInputHandler does not ack before a new event
 // arrives, that only the most recent ack is fired.
 TEST_F(CompositorMusConnectionTest, LostAck) {
   mus::TestWindow test_window;
-  mus::mojom::EventPtr event1 = mus::mojom::Event::New();
-  GenerateKeyEvent(event1);
+  scoped_ptr<ui::Event> event1(GenerateKeyEvent());
   scoped_refptr<TestCallback> test_callback1(new TestCallback);
   scoped_ptr<base::Callback<void(bool)>> ack_callback1(
       new base::Callback<void(bool)>(
           base::Bind(&::TestCallback::BoolCallback, test_callback1)));
 
-  OnWindowInputEvent(&test_window, std::move(event1), &ack_callback1);
+  OnWindowInputEvent(&test_window, *event1.get(), &ack_callback1);
   EXPECT_FALSE(ack_callback1.get());
   // When simulating the timeout the ack is never enqueued
   VerifyAndRunQueues(true, false);
 
   // Setting a delegate will lead to the next event being acked. Having a
   // cleared queue simulates the input handler timing out on an event.
   TestRenderWidgetInputHandler* input_handler = render_widget_input_handler();
   input_handler->set_delegate(connection());
   input_handler->set_state(InputEventAckState::INPUT_EVENT_ACK_STATE_CONSUMED);
 
-  mus::mojom::EventPtr event2 = mus::mojom::Event::New();
-  GenerateKeyEvent(event2);
+  scoped_ptr<ui::Event> event2(GenerateKeyEvent());
   scoped_refptr<TestCallback> test_callback2(new TestCallback);
   scoped_ptr<base::Callback<void(bool)>> ack_callback2(
       new base::Callback<void(bool)>(
           base::Bind(&::TestCallback::BoolCallback, test_callback2)));
-  OnWindowInputEvent(&test_window, std::move(event2), &ack_callback2);
+  OnWindowInputEvent(&test_window, *event2.get(), &ack_callback2);
   EXPECT_FALSE(ack_callback2.get());
 
   VerifyAndRunQueues(true, true);
 
   // Only the most recent ack was called.
   EXPECT_FALSE(test_callback1->called());
   EXPECT_TRUE(test_callback2->called());
   EXPECT_TRUE(test_callback2->result());
 }
 
 // Tests that when an input handler consumes the event, that
 // CompositorMusConnection does not consume the ack, nor calls it.
 TEST_F(CompositorMusConnectionTest, InputHandlerConsumes) {
   input_handler_manager()->SetHandleInputEventResult(
       InputEventAckState::INPUT_EVENT_ACK_STATE_CONSUMED);
   mus::TestWindow test_window;
-  mus::mojom::EventPtr event = mus::mojom::Event::New();
-  GenerateKeyEvent(event);
+  scoped_ptr<ui::Event> event(GenerateKeyEvent());
   scoped_refptr<TestCallback> test_callback(new TestCallback);
   scoped_ptr<base::Callback<void(bool)>> ack_callback(
       new base::Callback<void(bool)>(
           base::Bind(&::TestCallback::BoolCallback, test_callback)));
 
-  OnWindowInputEvent(&test_window, std::move(event), &ack_callback);
+  OnWindowInputEvent(&test_window, *event.get(), &ack_callback);
 
   EXPECT_TRUE(ack_callback.get());
   VerifyAndRunQueues(false, false);
   EXPECT_FALSE(test_callback->called());
 }
 
 // Tests that when the renderer will not ack an event, that
 // CompositorMusConnection does not consume the ack, nor calls it.
 TEST_F(CompositorMusConnectionTest, RendererWillNotSendAck) {
   mus::TestWindow test_window;
-  mus::mojom::EventPtr event = mus::mojom::Event::New();
-  event->action = mus::mojom::EventType::POINTER_DOWN;
-  event->time_stamp = base::TimeTicks::Now().ToInternalValue();
-  event->pointer_data = mus::mojom::PointerData::New();
+  ui::PointerEvent event(ui::ET_POINTER_DOWN,
+                         ui::EventPointerType::POINTER_TYPE_MOUSE, gfx::Point(),
+                         gfx::Point(), ui::EF_NONE, 0, ui::EventTimeForNow());
 
   scoped_refptr<TestCallback> test_callback(new TestCallback);
   scoped_ptr<base::Callback<void(bool)>> ack_callback(
       new base::Callback<void(bool)>(
           base::Bind(&::TestCallback::BoolCallback, test_callback)));
 
-  OnWindowInputEvent(&test_window, std::move(event), &ack_callback);
+  OnWindowInputEvent(&test_window, event, &ack_callback);
   EXPECT_TRUE(ack_callback.get());
 
   VerifyAndRunQueues(true, false);
   EXPECT_FALSE(test_callback->called());
 }
 
 }  // namespace content