Remoes X11 dependency in InputMethodEngine.

ui/base/ime/chromeos/character_composer_unittest.cc

 // Copyright 2013 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 "ui/base/ime/chromeos/character_composer.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/gtk+/gdk/gdkkeysyms.h"
 #include "ui/base/glib/glib_integers.h"
 #include "ui/events/event_constants.h"
+#include "ui/events/keycodes/keyboard_codes.h"
 
 using base::ASCIIToUTF16;
 
 namespace ui {
 
 class CharacterComposerTest : public testing::Test {
  protected:
   bool FilterKeyPress(CharacterComposer* character_composer,
                       uint key,
                       uint keycode,
@@ skipping 397 matching lines @@
   ExpectKeyNotFiltered(&character_composer, GDK_KEY_3, 0);
 }
 
 TEST_F(CharacterComposerTest, HexadecimalCompositionPreeditWithModifierPressed)
 {
   // This test case supposes X Window System uses 101 keyboard layout.
   CharacterComposer character_composer;
   const int control_shift =  EF_CONTROL_DOWN | EF_SHIFT_DOWN;
   // HIRAGANA LETTER A (U+3042)
   ExpectKeyFilteredWithKeycode(&character_composer,
-                               GDK_KEY_U, 30, control_shift);
+                               GDK_KEY_U, ui::VKEY_U, control_shift);
   EXPECT_EQ(ASCIIToUTF16("u"), character_composer.preedit_string());
   ExpectKeyFilteredWithKeycode(&character_composer,
-                               GDK_KEY_numbersign, 12, control_shift);
+                               GDK_KEY_numbersign, ui::VKEY_3, control_shift);
   EXPECT_EQ(ASCIIToUTF16("u3"), character_composer.preedit_string());
   ExpectKeyFilteredWithKeycode(&character_composer,
-                               GDK_KEY_parenright, 19, control_shift);
+                               GDK_KEY_parenright, ui::VKEY_0, control_shift);
   EXPECT_EQ(ASCIIToUTF16("u30"), character_composer.preedit_string());
   ExpectKeyFilteredWithKeycode(&character_composer,
-                               GDK_KEY_dollar, 13, control_shift);
+                               GDK_KEY_dollar, ui::VKEY_4, control_shift);
   EXPECT_EQ(ASCIIToUTF16("u304"), character_composer.preedit_string());
   ExpectKeyFilteredWithKeycode(&character_composer,
-                               GDK_KEY_A, 38, control_shift);
+                               GDK_KEY_A, ui::VKEY_A, control_shift);
   EXPECT_EQ(ASCIIToUTF16("u304a"), character_composer.preedit_string());
   ExpectKeyFilteredWithKeycode(&character_composer,
-                               GDK_KEY_BackSpace, 22, control_shift);
+                               GDK_KEY_BackSpace, ui::VKEY_BACK, control_shift);
   EXPECT_EQ(ASCIIToUTF16("u304"), character_composer.preedit_string());
   ExpectKeyFilteredWithKeycode(&character_composer,
-                               GDK_KEY_at, 11, control_shift);
+                               GDK_KEY_at, ui::VKEY_2, control_shift);
   EXPECT_EQ(ASCIIToUTF16("u3042"), character_composer.preedit_string());
   ExpectCharacterComposedWithKeyCode(&character_composer,
-                                     GDK_KEY_Return, 36,
+                                     GDK_KEY_Return, ui::VKEY_RETURN,
                                      control_shift,
                                      base::string16(1, 0x3042));
   EXPECT_EQ(ASCIIToUTF16(""), character_composer.preedit_string());
 
   // Sequence with an ignored character (control + shift + 'x') and Escape.
   ExpectKeyFilteredWithKeycode(&character_composer,
-                               GDK_KEY_U, 30, control_shift);
+                               GDK_KEY_U, ui::VKEY_U, control_shift);
   EXPECT_EQ(ASCIIToUTF16("u"), character_composer.preedit_string());
   ExpectKeyFilteredWithKeycode(&character_composer,
-                               GDK_KEY_numbersign, 12, control_shift);
+                               GDK_KEY_numbersign, ui::VKEY_3, control_shift);
   EXPECT_EQ(ASCIIToUTF16("u3"), character_composer.preedit_string());
   ExpectKeyFilteredWithKeycode(&character_composer,
-                               GDK_KEY_parenright, 19, control_shift);
+                               GDK_KEY_parenright, ui::VKEY_0, control_shift);
   EXPECT_EQ(ASCIIToUTF16("u30"), character_composer.preedit_string());
   ExpectKeyFilteredWithKeycode(&character_composer,
-                               GDK_KEY_X, 53, control_shift);
+                               GDK_KEY_X, ui::VKEY_X, control_shift);
   EXPECT_EQ(ASCIIToUTF16("u30"), character_composer.preedit_string());
   ExpectKeyFilteredWithKeycode(&character_composer,
-                               GDK_KEY_dollar, 13, control_shift);
+                               GDK_KEY_dollar, ui::VKEY_4, control_shift);
   EXPECT_EQ(ASCIIToUTF16("u304"), character_composer.preedit_string());
   ExpectKeyFilteredWithKeycode(&character_composer,
-                               GDK_KEY_at, 11, control_shift);
+                               GDK_KEY_at, ui::VKEY_2, control_shift);
   EXPECT_EQ(ASCIIToUTF16("u3042"), character_composer.preedit_string());
   ExpectKeyFilteredWithKeycode(&character_composer,
-                               GDK_KEY_Escape, 9, control_shift);
+                               GDK_KEY_Escape, ui::VKEY_ESCAPE, control_shift);
   EXPECT_EQ(ASCIIToUTF16(""), character_composer.preedit_string());
 }
 
 TEST_F(CharacterComposerTest, InvalidHexadecimalSequence) {
   CharacterComposer character_composer;
   // U+FFFFFFFF
   ExpectKeyFiltered(&character_composer, GDK_KEY_U,
                     EF_SHIFT_DOWN | EF_CONTROL_DOWN);
   for (int i = 0; i < 8; ++i)
     ExpectKeyFiltered(&character_composer, GDK_KEY_f, 0);
@@ skipping 46 matching lines @@
 
 TEST_F(CharacterComposerTest, BlacklistedKeyeventsTest) {
   CharacterComposer character_composer;
   EXPECT_TRUE(FilterKeyPress(&character_composer, GDK_KEY_dead_acute, 0, 0));
   EXPECT_FALSE(FilterKeyPress(&character_composer, GDK_KEY_s, 0, 0));
   ASSERT_EQ(1U, character_composer.composed_character().size());
   EXPECT_EQ(GDK_KEY_apostrophe, character_composer.composed_character().at(0));
 }
 
 }  // namespace ui