Adds the ability for WebContentsDelegate to decide if event should be updated

content/browser/renderer_host/render_widget_host_unittest.cc

 // Copyright (c) 2012 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 <stddef.h>
 #include <stdint.h>
 
 #include <memory>
 #include <tuple>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/test/scoped_feature_list.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/timer/timer.h"
 #include "build/build_config.h"
 #include "content/browser/gpu/compositor_util.h"
 #include "content/browser/renderer_host/input/input_router_impl.h"
 #include "content/browser/renderer_host/render_widget_host_delegate.h"
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
 #include "content/common/edit_command.h"
 #include "content/common/input/synthetic_web_input_event_builders.h"
 #include "content/common/input_messages.h"
 #include "content/common/resize_params.h"
 #include "content/common/view_messages.h"
+#include "content/public/browser/keyboard_event_processing_result.h"
 #include "content/public/common/content_features.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/mock_render_process_host.h"
 #include "content/public/test/test_browser_context.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "content/test/test_render_view_host.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/display/screen.h"
 #include "ui/events/base_event_utils.h"
 #include "ui/events/blink/web_input_event_traits.h"
@@ skipping 364 matching lines @@
   void SetScreenInfo(const ScreenInfo& screen_info) {
     screen_info_ = screen_info;
   }
 
   // RenderWidgetHostDelegate overrides.
   void GetScreenInfo(ScreenInfo* screen_info) override {
     *screen_info = screen_info_;
   }
 
  protected:
-  bool PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event,
-                              bool* is_keyboard_shortcut) override {
+  KeyboardEventProcessingResult PreHandleKeyboardEvent(
+      const NativeWebKeyboardEvent& event) override {
     prehandle_keyboard_event_type_ = event.type();
     prehandle_keyboard_event_called_ = true;
-    *is_keyboard_shortcut = prehandle_keyboard_event_is_shortcut_;
-    return prehandle_keyboard_event_;
+    if (prehandle_keyboard_event_)
+      return KeyboardEventProcessingResult::HANDLED;
+    return prehandle_keyboard_event_is_shortcut_
+               ? KeyboardEventProcessingResult::NOT_HANDLED_IS_SHORTCUT
+               : KeyboardEventProcessingResult::NOT_HANDLED;
   }
 
   void HandleKeyboardEvent(const NativeWebKeyboardEvent& event) override {
     unhandled_keyboard_event_type_ = event.type();
     unhandled_keyboard_event_called_ = true;
   }
 
   bool HandleWheelEvent(const blink::WebMouseWheelEvent& event) override {
     handle_wheel_event_called_ = true;
     return handle_wheel_event_;
@@ skipping 132 matching lines @@
     NativeWebKeyboardEvent native_event(type, modifiers,
                                         GetNextSimulatedEventTimeSeconds());
     host_->ForwardKeyboardEvent(native_event);
   }
 
   void SimulateKeyboardEventWithCommands(WebInputEvent::Type type) {
     NativeWebKeyboardEvent native_event(type, 0,
                                         GetNextSimulatedEventTimeSeconds());
     EditCommands commands;
     commands.emplace_back("name", "value");
-    host_->ForwardKeyboardEventWithCommands(native_event, &commands);
+    host_->ForwardKeyboardEventWithCommands(native_event, &commands, nullptr);
   }
 
   void SimulateMouseEvent(WebInputEvent::Type type) {
     host_->ForwardMouseEvent(SyntheticWebMouseEventBuilder::Build(type));
   }
 
   void SimulateMouseEventWithLatencyInfo(WebInputEvent::Type type,
                                          const ui::LatencyInfo& ui_latency) {
     host_->ForwardMouseEventWithLatencyInfo(
         SyntheticWebMouseEventBuilder::Build(type),
@@ skipping 1240 matching lines @@
                                       ui::LatencyInfo());
 
 
   // Tests RWHI::ForwardWheelEventWithLatencyInfo().
   SimulateWheelEventWithLatencyInfo(-5, 0, 0, true, ui::LatencyInfo());
 
   ASSERT_FALSE(host_->input_router()->HasPendingEvents());
 }
 
 }  // namespace content