mash: Convert OnWindowInputEventAck to use an enum for handled status

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 <memory>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
@@ skipping 11 matching lines @@
 #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"
 
+using mus::mojom::EventResult;
+
 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) {}
+  TestCallback() : called_(false), result_(EventResult::UNHANDLED) {}
 
   bool called() { return called_; }
-  bool result() { return result_; }
+  EventResult result() { return result_; }
 
-  void BoolCallback(bool result) {
+  void ResultCallback(EventResult result) {
     called_ = true;
     result_ = result;
   }
 
  private:
   friend class base::RefCounted<TestCallback>;
 
   ~TestCallback() {}
 
   bool called_;
-  bool result_;
+  EventResult result_;
 
   DISALLOW_COPY_AND_ASSIGN(TestCallback);
 };
 
 // Allows for overriding the behaviour of HandleInputEvent, to simulate input
 // handlers which consume events before they are sent to the renderer.
 class TestInputHandlerManager : public content::InputHandlerManager {
  public:
   TestInputHandlerManager(
       const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
@@ skipping 144 matching lines @@
   ~CompositorMusConnectionTest() override {}
 
   // Returns a valid key event, so that it can be converted to a web event by
   // CompositorMusConnection.
   std::unique_ptr<ui::Event> GenerateKeyEvent();
 
   // Calls CompositorMusConnection::OnWindowInputEvent.
   void OnWindowInputEvent(
       mus::Window* window,
       const ui::Event& event,
-      std::unique_ptr<base::Callback<void(bool)>>* ack_callback);
+      std::unique_ptr<base::Callback<void(EventResult)>>* 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();
   }
   RenderWidgetMusConnection* connection() { return connection_; }
@@ skipping 36 matching lines @@
 };
 
 std::unique_ptr<ui::Event> CompositorMusConnectionTest::GenerateKeyEvent() {
   return std::unique_ptr<ui::Event>(new ui::KeyEvent(
       ui::ET_KEY_PRESSED, ui::KeyboardCode::VKEY_A, ui::EF_NONE));
 }
 
 void CompositorMusConnectionTest::OnWindowInputEvent(
     mus::Window* window,
     const ui::Event& event,
-    std::unique_ptr<base::Callback<void(bool)>>* ack_callback) {
+    std::unique_ptr<base::Callback<void(EventResult)>>* 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();
 
@@ skipping 39 matching lines @@
 // 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;
   std::unique_ptr<ui::Event> event(GenerateKeyEvent());
   scoped_refptr<TestCallback> test_callback(new TestCallback);
-  std::unique_ptr<base::Callback<void(bool)>> ack_callback(
-      new base::Callback<void(bool)>(
-          base::Bind(&::TestCallback::BoolCallback, test_callback)));
+  std::unique_ptr<base::Callback<void(EventResult)>> ack_callback(
+      new base::Callback<void(EventResult)>(
+          base::Bind(&::TestCallback::ResultCallback, test_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());
+  EXPECT_EQ(EventResult::UNHANDLED, 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;
   std::unique_ptr<ui::Event> event(GenerateKeyEvent());
   scoped_refptr<TestCallback> test_callback(new TestCallback);
-  std::unique_ptr<base::Callback<void(bool)>> ack_callback(
-      new base::Callback<void(bool)>(
-          base::Bind(&::TestCallback::BoolCallback, test_callback)));
+  std::unique_ptr<base::Callback<void(EventResult)>> ack_callback(
+      new base::Callback<void(EventResult)>(
+          base::Bind(&::TestCallback::ResultCallback, test_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());
+  EXPECT_EQ(EventResult::HANDLED, 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;
   std::unique_ptr<ui::Event> event1(GenerateKeyEvent());
   scoped_refptr<TestCallback> test_callback1(new TestCallback);
-  std::unique_ptr<base::Callback<void(bool)>> ack_callback1(
-      new base::Callback<void(bool)>(
-          base::Bind(&::TestCallback::BoolCallback, test_callback1)));
+  std::unique_ptr<base::Callback<void(EventResult)>> ack_callback1(
+      new base::Callback<void(EventResult)>(
+          base::Bind(&::TestCallback::ResultCallback, test_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);
 
   std::unique_ptr<ui::Event> event2(GenerateKeyEvent());
   scoped_refptr<TestCallback> test_callback2(new TestCallback);
-  std::unique_ptr<base::Callback<void(bool)>> ack_callback2(
-      new base::Callback<void(bool)>(
-          base::Bind(&::TestCallback::BoolCallback, test_callback2)));
+  std::unique_ptr<base::Callback<void(EventResult)>> ack_callback2(
+      new base::Callback<void(EventResult)>(
+          base::Bind(&::TestCallback::ResultCallback, test_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());
+  EXPECT_EQ(EventResult::HANDLED, 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;
   std::unique_ptr<ui::Event> event(GenerateKeyEvent());
   scoped_refptr<TestCallback> test_callback(new TestCallback);
-  std::unique_ptr<base::Callback<void(bool)>> ack_callback(
-      new base::Callback<void(bool)>(
-          base::Bind(&::TestCallback::BoolCallback, test_callback)));
+  std::unique_ptr<base::Callback<void(EventResult)>> ack_callback(
+      new base::Callback<void(EventResult)>(
+          base::Bind(&::TestCallback::ResultCallback, test_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;
   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);
-  std::unique_ptr<base::Callback<void(bool)>> ack_callback(
-      new base::Callback<void(bool)>(
-          base::Bind(&::TestCallback::BoolCallback, test_callback)));
+  std::unique_ptr<base::Callback<void(EventResult)>> ack_callback(
+      new base::Callback<void(EventResult)>(
+          base::Bind(&::TestCallback::ResultCallback, test_callback)));
 
   OnWindowInputEvent(&test_window, event, &ack_callback);
   EXPECT_TRUE(ack_callback.get());
 
   VerifyAndRunQueues(true, false);
   EXPECT_FALSE(test_callback->called());
 }
 
 // Tests that when a touch event id provided, that CompositorMusConnection
 // consumes the ack.
 TEST_F(CompositorMusConnectionTest, TouchEventConsumed) {
   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;
   ui::PointerEvent event(ui::ET_POINTER_DOWN,
                          ui::EventPointerType::POINTER_TYPE_TOUCH, 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)));
+  scoped_ptr<base::Callback<void(EventResult)>> ack_callback(
+      new base::Callback<void(EventResult)>(
+          base::Bind(&::TestCallback::ResultCallback, test_callback)));
 
   OnWindowInputEvent(&test_window, event, &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());
+  EXPECT_EQ(EventResult::HANDLED, test_callback->result());
 }
 
 }  // namespace content