Fix is_browser_shortcut; add a test.

chrome/browser/browser_keyevents_browsertest.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 "build/build_config.h"
 
 #include <stddef.h>
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/interactive_test_utils.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
+#include "content/public/browser/render_view_host.h"
+#include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
+#include "ui/events/keycodes/dom/keycode_converter.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 
 // TODO(kbr): remove: http://crbug.com/222296
 #if defined(OS_MACOSX)
 #import "base/mac/mac_util.h"
 #endif
 
 using content::NavigationController;
 
 namespace {
@@ skipping 771 matching lines @@
   ASSERT_NO_FATAL_FAILURE(ClickOnView(VIEW_ID_TAB_CONTAINER));
   ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER));
 
   int tab_index = browser()->tab_strip_model()->active_index();
   ASSERT_NO_FATAL_FAILURE(SetFocusedElement(tab_index, L"A"));
   EXPECT_NO_FATAL_FAILURE(TestKeyEvent(tab_index, kTestPageUp));
   EXPECT_NO_FATAL_FAILURE(TestKeyEvent(tab_index, kTestPageDown));
   EXPECT_NO_FATAL_FAILURE(CheckTextBoxValue(tab_index, L"A", L""));
 }
 
+class TestInputEventObserver
+    : public content::RenderWidgetHost::InputEventObserver {
+ public:
+  explicit TestInputEventObserver(content::RenderWidgetHost* host)
+      : host_(host), is_browser_shortcut_(false) {
+    host_->AddInputEventObserver(this);
+  }
+
+  ~TestInputEventObserver() override { host_->RemoveInputEventObserver(this); }
+
+  bool is_browser_shortcut() { return is_browser_shortcut_; }
+
+ private:
+  void OnInputEvent(const blink::WebInputEvent& event) override {
+    LOG(ERROR) << "OnInputEvent";
+    // LOG(ERROR) << " > type " << event.GetType();
+    // const blink::WebKeyboardEvent& key_event =
+    //     static_cast<const blink::WebKeyboardEvent&>(event);
+    // LOG(ERROR) << "key_event.is_browser_shortcut " <<
+    // key_event.is_browser_shortcut; LOG(ERROR) << "key_event.windows_key_code
+    // " << key_event.windows_key_code; LOG(ERROR) << "key_event.dom_code " <<
+    // key_event.dom_code; LOG(ERROR) << "key_event.dom_key " <<
+    // key_event.dom_key; LOG(ERROR) << "key_event.text[0] " <<
+    // key_event.text[0] << " "
+    //   << (key_event.text[0] ? ((char)key_event.text[0]) : ' ');
+    // LOG(ERROR) << "is_modifier " <<
+    // ui::KeycodeConverter::IsDomKeyForModifier(key_event.dom_key);
+    if (event.GetType() != blink::WebInputEvent::kRawKeyDown)
+      return;
+    const blink::WebKeyboardEvent& key_event =
+        static_cast<const blink::WebKeyboardEvent&>(event);
+    if (ui::KeycodeConverter::IsDomKeyForModifier(key_event.dom_key))
+      return;
+    LOG(ERROR) << "^^^";
+    is_browser_shortcut_ = key_event.is_browser_shortcut;
+  };
+
+  content::RenderWidgetHost* host_;
+  bool is_browser_shortcut_;
+
+  DISALLOW_COPY_AND_ASSIGN(TestInputEventObserver);
+};
+
+// Tests to make sure that the |is_browser_shortcut| value is properly set on
+// input events.
+IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, InputBrowserShortcut) {
+  content::WebContents* web_contents =
+      browser()->tab_strip_model()->GetActiveWebContents();
+  content::RenderWidgetHost* widget_host =
+      web_contents->GetRenderViewHost()->GetWidget();
+  TestInputEventObserver observer(widget_host);
+
+#if defined(OS_MACOSX)
+  bool command = true;
+  bool control = false;
+#else
+  bool command = false;
+  bool control = true;
+#endif
+
+  // Control/Command+G is not a browser shortcut and shouldn't have the "browser
+  // shortcut" bit set.
+  // ASSERT_TRUE(ui_test_utils::SendKeyPressSync(browser(), ui::VKEY_G, control,
+  //                           /*shift=*/false, /*alt=*/false, command));
+  // EXPECT_FALSE(observer.is_browser_shortcut());
+
+  // Control/Command+R is a browser shortcut and should have the "browser
+  // shortcut" bit set.
+  ASSERT_TRUE(ui_test_utils::SendKeyPressSync(browser(), ui::VKEY_R, control,
+                            /*shift=*/false, /*alt=*/false, command));
+  EXPECT_TRUE(observer.is_browser_shortcut());
+}
+
 // AltKey is enabled only on Windows. See crbug.com/114537.
 #if defined(OS_WIN)
 // If this flakes, disable and log details in http://crbug.com/523255.
 // TODO(sky): remove comment if proves stable and reenable other tests.
 IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, FocusMenuBarByAltKey) {
   static const KeyEventTestData kTestAltKey = {
     ui::VKEY_MENU, false, false, false, false,
     false, false, false, false, 2,
     { "D 18 0 false false true false",
       "U 18 0 false false true false" }
@@ skipping 36 matching lines @@
   EXPECT_NO_FATAL_FAILURE(TestKeyEvent(tab_index, kTestAltKeySuppress));
   ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER));
 
   // Ctrl+Alt should have no effect.
   EXPECT_NO_FATAL_FAILURE(TestKeyEvent(tab_index, kTestCtrlAltKey));
   ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER));
 }
 #endif
 
 }  // namespace