ozone: Rename XKeyboard to KeyboardController & use fake under ozone

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
 #undef None
 #undef RootWindow
 
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/window_state.h"
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/prefs/pref_member.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/chromeos/input_method/input_method_configuration.h"
 #include "chrome/browser/chromeos/input_method/mock_input_method_manager.h"
 #include "chrome/browser/chromeos/login/mock_user_manager.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/preferences.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_pref_service_syncable.h"
 #include "chromeos/chromeos_switches.h"
-#include "chromeos/ime/fake_xkeyboard.h"
+#include "chromeos/ime/fake_ime_keyboard.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/window.h"
 #include "ui/events/event.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 GetRewrittenEventAsString(chromeos::EventRewriter* rewriter,
@@ skipping 1480 matching lines @@
 }
 
 TEST_F(EventRewriterTest, TestRewriteModifiersRemapToCapsLock) {
   // Remap Search to Caps Lock.
   TestingPrefServiceSyncable prefs;
   chromeos::Preferences::RegisterProfilePrefs(prefs.registry());
   IntegerPrefMember search;
   search.Init(prefs::kLanguageRemapSearchKeyTo, &prefs);
   search.SetValue(chromeos::input_method::kCapsLockKey);
 
-  chromeos::input_method::FakeXKeyboard xkeyboard;
+  chromeos::input_method::FakeImeKeyboard keyboard;
   EventRewriter rewriter;
   rewriter.set_pref_service_for_testing(&prefs);
-  rewriter.set_xkeyboard_for_testing(&xkeyboard);
-  EXPECT_FALSE(xkeyboard.caps_lock_is_enabled_);
+  rewriter.set_keyboard_for_testing(&keyboard);
+  EXPECT_FALSE(keyboard.caps_lock_is_enabled_);
 
   // Press Search.
   EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_CAPITAL,
                                       ui::EF_CAPS_LOCK_DOWN,
                                       ui::ET_KEY_PRESSED,
                                       keycode_caps_lock_,
                                       0U,
                                       KeyPress),
             GetRewrittenEventAsString(&rewriter,
                                       ui::VKEY_LWIN,
                                       0,
                                       ui::ET_KEY_PRESSED,
                                       keycode_super_l_,
                                       0U));
   // Confirm that the Caps Lock status is changed.
-  EXPECT_TRUE(xkeyboard.caps_lock_is_enabled_);
+  EXPECT_TRUE(keyboard.caps_lock_is_enabled_);
 
   // Release Search.
   EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_CAPITAL,
                                       ui::EF_NONE,
                                       ui::ET_KEY_RELEASED,
                                       keycode_caps_lock_,
                                       LockMask,
                                       KeyRelease),
             GetRewrittenEventAsString(&rewriter,
                                       ui::VKEY_LWIN,
                                       ui::EF_CAPS_LOCK_DOWN,
                                       ui::ET_KEY_RELEASED,
                                       keycode_super_l_,
                                       Mod4Mask | LockMask));
   // Confirm that the Caps Lock status is not changed.
-  EXPECT_TRUE(xkeyboard.caps_lock_is_enabled_);
+  EXPECT_TRUE(keyboard.caps_lock_is_enabled_);
 
   // Press Search.
   EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_CAPITAL,
                                       ui::EF_CAPS_LOCK_DOWN,
                                       ui::ET_KEY_PRESSED,
                                       keycode_caps_lock_,
                                       LockMask,
                                       KeyPress),
             GetRewrittenEventAsString(&rewriter,
                                       ui::VKEY_LWIN,
                                       ui::EF_CAPS_LOCK_DOWN,
                                       ui::ET_KEY_PRESSED,
                                       keycode_super_l_,
                                       LockMask));
   // Confirm that the Caps Lock status is changed.
-  EXPECT_FALSE(xkeyboard.caps_lock_is_enabled_);
+  EXPECT_FALSE(keyboard.caps_lock_is_enabled_);
 
   // Release Search.
   EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_CAPITAL,
                                       ui::EF_NONE,
                                       ui::ET_KEY_RELEASED,
                                       keycode_caps_lock_,
                                       LockMask,
                                       KeyRelease),
             GetRewrittenEventAsString(&rewriter,
                                       ui::VKEY_LWIN,
                                       ui::EF_CAPS_LOCK_DOWN,
                                       ui::ET_KEY_RELEASED,
                                       keycode_super_l_,
                                       Mod4Mask | LockMask));
   // Confirm that the Caps Lock status is not changed.
-  EXPECT_FALSE(xkeyboard.caps_lock_is_enabled_);
+  EXPECT_FALSE(keyboard.caps_lock_is_enabled_);
 
   // Press Caps Lock (on an external keyboard).
   EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_CAPITAL,
                                       ui::EF_CAPS_LOCK_DOWN,
                                       ui::ET_KEY_PRESSED,
                                       keycode_caps_lock_,
                                       0U,
                                       KeyPress),
             GetRewrittenEventAsString(&rewriter,
                                       ui::VKEY_CAPITAL,
                                       ui::EF_NONE,
                                       ui::ET_KEY_PRESSED,
                                       keycode_caps_lock_,
                                       0U));
 
   // Confirm that calling RewriteForTesting() does not change the state of
-  // |xkeyboard|. In this case, X Window system itself should change the
+  // |keyboard|. In this case, X Window system itself should change the
   // Caps Lock state, not ash::EventRewriter.
-  EXPECT_FALSE(xkeyboard.caps_lock_is_enabled_);
+  EXPECT_FALSE(keyboard.caps_lock_is_enabled_);
 
   // Release Caps Lock (on an external keyboard).
   EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_CAPITAL,
                                       ui::EF_NONE,
                                       ui::ET_KEY_RELEASED,
                                       keycode_caps_lock_,
                                       LockMask,
                                       KeyRelease),
             GetRewrittenEventAsString(&rewriter,
                                       ui::VKEY_CAPITAL,
                                       ui::EF_CAPS_LOCK_DOWN,
                                       ui::ET_KEY_RELEASED,
                                       keycode_caps_lock_,
                                       LockMask));
-  EXPECT_FALSE(xkeyboard.caps_lock_is_enabled_);
+  EXPECT_FALSE(keyboard.caps_lock_is_enabled_);
 }
 
 TEST_F(EventRewriterTest, DISABLED_TestRewriteCapsLock) {
   // It seems that the X server running on build servers is too old and does not
   // support F16 (i.e. 'XKeysymToKeycode(display_, XF86XK_Launch7)' call).
   // TODO(yusukes): Reenable the test once build servers are upgraded.
 
   TestingPrefServiceSyncable prefs;
   chromeos::Preferences::RegisterProfilePrefs(prefs.registry());
 
-  chromeos::input_method::FakeXKeyboard xkeyboard;
+  chromeos::input_method::FakeImeKeyboard keyboard;
   EventRewriter rewriter;
   rewriter.set_pref_service_for_testing(&prefs);
-  rewriter.set_xkeyboard_for_testing(&xkeyboard);
-  EXPECT_FALSE(xkeyboard.caps_lock_is_enabled_);
+  rewriter.set_keyboard_for_testing(&keyboard);
+  EXPECT_FALSE(keyboard.caps_lock_is_enabled_);
 
   // On Chrome OS, CapsLock is mapped to F16 with Mod3Mask.
   EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_CAPITAL,
                                       ui::EF_CAPS_LOCK_DOWN,
                                       ui::ET_KEY_PRESSED,
                                       keycode_caps_lock_,
                                       0U,
                                       KeyPress),
             GetRewrittenEventAsString(&rewriter,
                                       ui::VKEY_F16,
                                       0,
                                       ui::ET_KEY_PRESSED,
                                       keycode_launch7_,
                                       0U));
-  EXPECT_TRUE(xkeyboard.caps_lock_is_enabled_);
+  EXPECT_TRUE(keyboard.caps_lock_is_enabled_);
 }
 
 TEST_F(EventRewriterTest, DISABLED_TestRewriteDiamondKey) {
   // TODO(yusukes): Reenable the test once build servers are upgraded.
 
   TestingPrefServiceSyncable prefs;
   chromeos::Preferences::RegisterProfilePrefs(prefs.registry());
 
-  chromeos::input_method::FakeXKeyboard xkeyboard;
+  chromeos::input_method::FakeImeKeyboard keyboard;
   EventRewriter rewriter;
   rewriter.set_pref_service_for_testing(&prefs);
-  rewriter.set_xkeyboard_for_testing(&xkeyboard);
+  rewriter.set_keyboard_for_testing(&keyboard);
 
   // F15 should work as Ctrl when --has-chromeos-diamond-key is not specified.
   EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_CONTROL,
                                       ui::EF_CONTROL_DOWN,
                                       ui::ET_KEY_PRESSED,
                                       keycode_control_l_,
                                       0U,
                                       KeyPress),
             GetRewrittenEventAsString(&rewriter,
                                       ui::VKEY_F15,
@@ skipping 21 matching lines @@
 TEST_F(EventRewriterTest, DISABLED_TestRewriteDiamondKeyWithFlag) {
   // TODO(yusukes): Reenable the test once build servers are upgraded.
 
   const CommandLine original_cl(*CommandLine::ForCurrentProcess());
   CommandLine::ForCurrentProcess()->AppendSwitchASCII(
       chromeos::switches::kHasChromeOSDiamondKey, "");
 
   TestingPrefServiceSyncable prefs;
   chromeos::Preferences::RegisterProfilePrefs(prefs.registry());
 
-  chromeos::input_method::FakeXKeyboard xkeyboard;
+  chromeos::input_method::FakeImeKeyboard keyboard;
   EventRewriter rewriter;
   rewriter.set_pref_service_for_testing(&prefs);
-  rewriter.set_xkeyboard_for_testing(&xkeyboard);
+  rewriter.set_keyboard_for_testing(&keyboard);
 
   // By default, F15 should work as Control.
   EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_CONTROL,
                                       ui::EF_CONTROL_DOWN,
                                       ui::ET_KEY_PRESSED,
                                       keycode_control_l_,
                                       0U,
                                       KeyPress),
             GetRewrittenEventAsString(&rewriter,
                                       ui::VKEY_F15,
@@ skipping 743 matching lines @@
     ui::ScopedXI2Event xev;
     xev.InitGenericButtonEvent(
         11, ui::ET_MOUSE_RELEASED, gfx::Point(), kLeftAndAltFlag);
     ui::MouseEvent release(xev);
     RewriteMouseEvent(&rewriter, &release);
     EXPECT_TRUE(ui::EF_RIGHT_MOUSE_BUTTON & release.flags());
   }
 }
 
 }  // namespace chromeos