Fix handling of rewritten-Alt + Button1 -> Button3.

chrome/browser/chromeos/events/event_rewriter_unittest.cc

 // Copyright 2014 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 "chrome/browser/chromeos/events/event_rewriter.h"
 
 #include <X11/keysym.h>
 #include <X11/XF86keysym.h>
 #include <X11/Xlib.h>
 #undef Bool
@@ skipping 20 matching lines @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/window.h"
 #include "ui/events/event.h"
 #include "ui/events/event_rewriter.h"
 #include "ui/events/test/events_test_utils_x11.h"
 #include "ui/events/x/touch_factory_x11.h"
 #include "ui/gfx/x/x11_types.h"
 
 namespace {
 
 std::string GetExpectedResultAsString(ui::KeyboardCode ui_keycode,

[kpschoedel, 2014/06/02 00:52:36]

All changes to this file in this patch set are from rebasing.

                                       int ui_flags,
                                       ui::EventType ui_type) {
   return base::StringPrintf("ui_keycode=0x%X ui_flags=0x%X ui_type=%d",
                             ui_keycode,
                             ui_flags,
                             ui_type);
 }
 
 std::string GetKeyEventAsString(const ui::KeyEvent& keyevent) {
   return GetExpectedResultAsString(
@@ skipping 1506 matching lines @@
   // rewritten to the back key.
   send_function_keys_pref.SetValue(false);
   ASSERT_TRUE(RewriteFunctionKeys(press_f1, &rewritten_event));
   ASSERT_TRUE(rewritten_event);
   EXPECT_EQ(GetExpectedResultAsString(
                 ui::VKEY_BROWSER_BACK, ui::EF_NONE, ui::ET_KEY_PRESSED),
             GetKeyEventAsString(
                 *static_cast<const ui::KeyEvent*>(rewritten_event.get())));
 }
 
+TEST_F(EventRewriterTest, TestRewrittenModifierClick) {
+  std::vector<unsigned int> device_list;
+  device_list.push_back(10);
+  ui::TouchFactory::GetInstance()->SetPointerDeviceForTest(device_list);
+
+  // Remap Control to Alt.
+  TestingPrefServiceSyncable prefs;
+  chromeos::Preferences::RegisterProfilePrefs(prefs.registry());
+  IntegerPrefMember control;
+  control.Init(prefs::kLanguageRemapControlKeyTo, &prefs);
+  control.SetValue(chromeos::input_method::kAltKey);
+
+  EventRewriter rewriter;
+  rewriter.set_pref_service_for_testing(&prefs);
+
+  // Check that Control + Left Button is converted (via Alt + Left Button)
+  // to Right Button.
+  ui::ScopedXI2Event xev;
+  xev.InitGenericButtonEvent(10,
+                             ui::ET_MOUSE_PRESSED,
+                             gfx::Point(),
+                             ui::EF_LEFT_MOUSE_BUTTON | ui::EF_CONTROL_DOWN);
+  ui::MouseEvent press(xev);
+  // Sanity check.
+  EXPECT_EQ(ui::ET_MOUSE_PRESSED, press.type());
+  EXPECT_EQ(ui::EF_LEFT_MOUSE_BUTTON | ui::EF_CONTROL_DOWN, press.flags());
+  int flags = RewriteMouseEvent(&rewriter, press);
+  EXPECT_TRUE(ui::EF_RIGHT_MOUSE_BUTTON & flags);
+  EXPECT_FALSE(ui::EF_CONTROL_DOWN & flags);
+  EXPECT_FALSE(ui::EF_ALT_DOWN & flags);
+}
+
+
 TEST_F(EventRewriterTest, DontRewriteIfNotRewritten) {
   std::vector<unsigned int> device_list;
   device_list.push_back(10);
   device_list.push_back(11);
   ui::TouchFactory::GetInstance()->SetPointerDeviceForTest(device_list);
   TestingPrefServiceSyncable prefs;
   EventRewriter rewriter;
   rewriter.set_pref_service_for_testing(&prefs);
   const int kLeftAndAltFlag = ui::EF_LEFT_MOUSE_BUTTON | ui::EF_ALT_DOWN;
   {
@@ skipping 55 matching lines @@
     ui::ScopedXI2Event xev;
     xev.InitGenericButtonEvent(
         11, ui::ET_MOUSE_RELEASED, gfx::Point(), kLeftAndAltFlag);
     ui::MouseEvent release(xev);
     int flags = RewriteMouseEvent(&rewriter, release);
     EXPECT_TRUE(ui::EF_RIGHT_MOUSE_BUTTON & flags);
   }
 }
 
 }  // namespace chromeos