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

chrome/browser/chromeos/events/event_rewriter_unittest.cc

Index: chrome/browser/chromeos/events/event_rewriter_unittest.cc
diff --git a/chrome/browser/chromeos/events/event_rewriter_unittest.cc b/chrome/browser/chromeos/events/event_rewriter_unittest.cc
index ed0e7e10bf5b911971932364fc994c4804303874..c42d75aef6a16248a4f38828cffeea1b8edca3ae 100644
--- a/chrome/browser/chromeos/events/event_rewriter_unittest.cc
+++ b/chrome/browser/chromeos/events/event_rewriter_unittest.cc
@@ -1472,6 +1472,39 @@ TEST_F(EventRewriterAshTest, TopRowKeysAreFunctionKeys) {
                 *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);