Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(690)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/base/ime/chromeos/character_composer_unittest.cc

Issue 1560293002: Rename KEY_ constants to avoid conflict with <linux/input.h> (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address review comments (Wez) Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/test/app_remoting_latency_test_fixture.cc ('k') | ui/events/event.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/ime/chromeos/character_composer_unittest.cc
diff --git a/ui/base/ime/chromeos/character_composer_unittest.cc b/ui/base/ime/chromeos/character_composer_unittest.cc
index 235ad477c3c10b136e4f6e94a138a437ff4e7cd8..60627984b9273c120bf39d4a594ebdf8ff742dec 100644
--- a/ui/base/ime/chromeos/character_composer_unittest.cc
+++ b/ui/base/ime/chromeos/character_composer_unittest.cc
@@ -107,10 +107,10 @@ TEST_F(CharacterComposerTest, InitialState) {
}
TEST_F(CharacterComposerTest, NormalKeyIsNotFiltered) {
- ExpectUnicodeKeyNotFiltered(VKEY_B, DomCode::KEY_B, EF_NONE, 'B');
- ExpectUnicodeKeyNotFiltered(VKEY_Z, DomCode::KEY_Z, EF_NONE, 'Z');
- ExpectUnicodeKeyNotFiltered(VKEY_C, DomCode::KEY_C, EF_NONE, 'c');
- ExpectUnicodeKeyNotFiltered(VKEY_M, DomCode::KEY_M, EF_NONE, 'm');
+ ExpectUnicodeKeyNotFiltered(VKEY_B, DomCode::US_B, EF_NONE, 'B');
+ ExpectUnicodeKeyNotFiltered(VKEY_Z, DomCode::US_Z, EF_NONE, 'Z');
+ ExpectUnicodeKeyNotFiltered(VKEY_C, DomCode::US_C, EF_NONE, 'c');
+ ExpectUnicodeKeyNotFiltered(VKEY_M, DomCode::US_M, EF_NONE, 'm');
ExpectUnicodeKeyNotFiltered(VKEY_0, DomCode::DIGIT0, EF_NONE, '0');
ExpectUnicodeKeyNotFiltered(VKEY_1, DomCode::DIGIT1, EF_NONE, '1');
ExpectUnicodeKeyNotFiltered(VKEY_8, DomCode::DIGIT8, EF_NONE, '8');
@@ -130,11 +130,11 @@ TEST_F(CharacterComposerTest, PartiallyMatchingSequence) {
TEST_F(CharacterComposerTest, FullyMatchingSequences) {
// LATIN SMALL LETTER A WITH ACUTE
ExpectDeadKeyFiltered(kCombiningAcute);
- ExpectUnicodeKeyComposed(VKEY_A, DomCode::KEY_A, EF_NONE, 'a',
+ ExpectUnicodeKeyComposed(VKEY_A, DomCode::US_A, EF_NONE, 'a',
base::string16(1, 0x00E1));
// LATIN CAPITAL LETTER A WITH ACUTE
ExpectDeadKeyFiltered(kCombiningAcute);
- ExpectUnicodeKeyComposed(VKEY_A, DomCode::KEY_A, EF_NONE, 'A',
+ ExpectUnicodeKeyComposed(VKEY_A, DomCode::US_A, EF_NONE, 'A',
base::string16(1, 0x00C1));
// GRAVE ACCENT
ExpectDeadKeyFiltered(kCombiningGrave);
@@ -142,24 +142,24 @@ TEST_F(CharacterComposerTest, FullyMatchingSequences) {
// LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE
ExpectDeadKeyFiltered(kCombiningAcute);
ExpectDeadKeyFiltered(kCombiningCircumflex);
- ExpectUnicodeKeyComposed(VKEY_A, DomCode::KEY_A, EF_NONE, 'a',
+ ExpectUnicodeKeyComposed(VKEY_A, DomCode::US_A, EF_NONE, 'a',
base::string16(1, 0x1EA5));
// LATIN CAPITAL LETTER U WITH HORN AND GRAVE
ExpectDeadKeyFiltered(kCombiningGrave);
ExpectDeadKeyFiltered(kCombiningHorn);
- ExpectUnicodeKeyComposed(VKEY_U, DomCode::KEY_U, EF_NONE, 'U',
+ ExpectUnicodeKeyComposed(VKEY_U, DomCode::US_U, EF_NONE, 'U',
base::string16(1, 0x1EEA));
// LATIN CAPITAL LETTER C WITH CEDILLA
ExpectDeadKeyFiltered(kCombiningAcute);
- ExpectUnicodeKeyComposed(VKEY_C, DomCode::KEY_C, EF_NONE, 'C',
+ ExpectUnicodeKeyComposed(VKEY_C, DomCode::US_C, EF_NONE, 'C',
base::string16(1, 0x00C7));
// LATIN SMALL LETTER C WITH CEDILLA
ExpectDeadKeyFiltered(kCombiningAcute);
- ExpectUnicodeKeyComposed(VKEY_C, DomCode::KEY_C, EF_NONE, 'c',
+ ExpectUnicodeKeyComposed(VKEY_C, DomCode::US_C, EF_NONE, 'c',
base::string16(1, 0x00E7));
// GREEK SMALL LETTER EPSILON WITH TONOS
ExpectDeadKeyFiltered(kCombiningAcute);
- ExpectUnicodeKeyComposed(VKEY_E, DomCode::KEY_E, EF_NONE, 0x03B5,
+ ExpectUnicodeKeyComposed(VKEY_E, DomCode::US_E, EF_NONE, 0x03B5,
base::string16(1, 0x03AD));
}
@@ -171,13 +171,13 @@ TEST_F(CharacterComposerTest, FullyMatchingSequencesAfterMatchingFailure) {
// LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE
ExpectDeadKeyFiltered(kCombiningAcute);
ExpectDeadKeyFiltered(kCombiningCircumflex);
- ExpectUnicodeKeyComposed(VKEY_A, DomCode::KEY_A, EF_NONE, 'a',
+ ExpectUnicodeKeyComposed(VKEY_A, DomCode::US_A, EF_NONE, 'a',
base::string16(1, 0x1EA5));
}
TEST_F(CharacterComposerTest, ComposedCharacterIsClearedAfterReset) {
ExpectDeadKeyFiltered(kCombiningAcute);
- ExpectUnicodeKeyComposed(VKEY_A, DomCode::KEY_A, EF_NONE, 'a',
+ ExpectUnicodeKeyComposed(VKEY_A, DomCode::US_A, EF_NONE, 'a',
base::string16(1, 0x00E1));
character_composer_.Reset();
EXPECT_TRUE(character_composer_.composed_character().empty());
@@ -188,7 +188,7 @@ TEST_F(CharacterComposerTest, CompositionStateIsClearedAfterReset) {
// no character is composed here because of reset.
ExpectDeadKeyFiltered(kCombiningAcute);
character_composer_.Reset();
- ExpectUnicodeKeyNotFiltered(VKEY_A, DomCode::KEY_A, EF_NONE, 'a');
+ ExpectUnicodeKeyNotFiltered(VKEY_A, DomCode::US_A, EF_NONE, 'a');
}
TEST_F(CharacterComposerTest, KeySequenceCompositionPreedit) {
@@ -196,7 +196,7 @@ TEST_F(CharacterComposerTest, KeySequenceCompositionPreedit) {
// preedit_string() is always empty in key sequence composition mode.
ExpectDeadKeyFiltered(kCombiningAcute);
EXPECT_TRUE(character_composer_.preedit_string().empty());
- ExpectUnicodeKeyComposed(VKEY_A, DomCode::KEY_A, EF_NONE, 'a',
+ ExpectUnicodeKeyComposed(VKEY_A, DomCode::US_A, EF_NONE, 'a',
base::string16(1, 0x00E1));
EXPECT_TRUE(character_composer_.preedit_string().empty());
}
@@ -266,7 +266,7 @@ TEST_F(CharacterComposerTest, MainTableIsCorrectlyOrdered) {
TEST_F(CharacterComposerTest, HexadecimalComposition) {
// HIRAGANA LETTER A (U+3042)
- ExpectUnicodeKeyFiltered(VKEY_U, DomCode::KEY_U,
+ ExpectUnicodeKeyFiltered(VKEY_U, DomCode::US_U,
EF_SHIFT_DOWN | EF_CONTROL_DOWN, 'U');
ExpectUnicodeKeyFiltered(VKEY_3, DomCode::DIGIT3, EF_NONE, '3');
ExpectUnicodeKeyFiltered(VKEY_0, DomCode::DIGIT0, EF_NONE, '0');
@@ -276,12 +276,12 @@ TEST_F(CharacterComposerTest, HexadecimalComposition) {
base::string16(1, 0x3042));
// MUSICAL KEYBOARD (U+1F3B9)
const base::char16 kMusicalKeyboard[] = {0xd83c, 0xdfb9};
- ExpectUnicodeKeyFiltered(VKEY_U, DomCode::KEY_U,
+ ExpectUnicodeKeyFiltered(VKEY_U, DomCode::US_U,
EF_SHIFT_DOWN | EF_CONTROL_DOWN, 'U');
ExpectUnicodeKeyFiltered(VKEY_1, DomCode::DIGIT1, EF_NONE, '1');
- ExpectUnicodeKeyFiltered(VKEY_F, DomCode::KEY_F, EF_NONE, 'f');
+ ExpectUnicodeKeyFiltered(VKEY_F, DomCode::US_F, EF_NONE, 'f');
ExpectUnicodeKeyFiltered(VKEY_3, DomCode::DIGIT3, EF_NONE, '3');
- ExpectUnicodeKeyFiltered(VKEY_B, DomCode::KEY_B, EF_NONE, 'b');
+ ExpectUnicodeKeyFiltered(VKEY_B, DomCode::US_B, EF_NONE, 'b');
ExpectUnicodeKeyFiltered(VKEY_9, DomCode::DIGIT9, EF_NONE, '9');
ExpectUnicodeKeyComposed(
VKEY_RETURN, DomCode::ENTER, EF_NONE, '\r',
@@ -291,7 +291,7 @@ TEST_F(CharacterComposerTest, HexadecimalComposition) {
TEST_F(CharacterComposerTest, HexadecimalCompositionPreedit) {
// HIRAGANA LETTER A (U+3042)
- ExpectUnicodeKeyFiltered(VKEY_U, DomCode::KEY_U,
+ ExpectUnicodeKeyFiltered(VKEY_U, DomCode::US_U,
EF_SHIFT_DOWN | EF_CONTROL_DOWN, 'U');
EXPECT_EQ(ASCIIToUTF16("u"), character_composer_.preedit_string());
ExpectUnicodeKeyFiltered(VKEY_3, DomCode::DIGIT3, 0, '3');
@@ -300,7 +300,7 @@ TEST_F(CharacterComposerTest, HexadecimalCompositionPreedit) {
EXPECT_EQ(ASCIIToUTF16("u30"), character_composer_.preedit_string());
ExpectUnicodeKeyFiltered(VKEY_4, DomCode::DIGIT4, 0, '4');
EXPECT_EQ(ASCIIToUTF16("u304"), character_composer_.preedit_string());
- ExpectUnicodeKeyFiltered(VKEY_A, DomCode::KEY_A, 0, 'a');
+ ExpectUnicodeKeyFiltered(VKEY_A, DomCode::US_A, 0, 'a');
EXPECT_EQ(ASCIIToUTF16("u304a"), character_composer_.preedit_string());
ExpectUnicodeKeyFiltered(VKEY_BACK, DomCode::BACKSPACE, EF_NONE, '\b');
EXPECT_EQ(ASCIIToUTF16("u304"), character_composer_.preedit_string());
@@ -311,14 +311,14 @@ TEST_F(CharacterComposerTest, HexadecimalCompositionPreedit) {
EXPECT_EQ(ASCIIToUTF16(""), character_composer_.preedit_string());
// Sequence with an ignored character ('x') and Escape.
- ExpectUnicodeKeyFiltered(VKEY_U, DomCode::KEY_U,
+ ExpectUnicodeKeyFiltered(VKEY_U, DomCode::US_U,
EF_SHIFT_DOWN | EF_CONTROL_DOWN, 'U');
EXPECT_EQ(ASCIIToUTF16("u"), character_composer_.preedit_string());
ExpectUnicodeKeyFiltered(VKEY_3, DomCode::DIGIT3, 0, '3');
EXPECT_EQ(ASCIIToUTF16("u3"), character_composer_.preedit_string());
ExpectUnicodeKeyFiltered(VKEY_0, DomCode::DIGIT0, 0, '0');
EXPECT_EQ(ASCIIToUTF16("u30"), character_composer_.preedit_string());
- ExpectUnicodeKeyFiltered(VKEY_X, DomCode::KEY_X, 0, 'x');
+ ExpectUnicodeKeyFiltered(VKEY_X, DomCode::US_X, 0, 'x');
EXPECT_EQ(ASCIIToUTF16("u30"), character_composer_.preedit_string());
ExpectUnicodeKeyFiltered(VKEY_4, DomCode::DIGIT4, 0, '4');
EXPECT_EQ(ASCIIToUTF16("u304"), character_composer_.preedit_string());
@@ -330,18 +330,18 @@ TEST_F(CharacterComposerTest, HexadecimalCompositionPreedit) {
TEST_F(CharacterComposerTest, HexadecimalCompositionWithNonHexKey) {
// Sequence [Ctrl+Shift+U, x, space] does not compose a character.
- ExpectUnicodeKeyFiltered(VKEY_U, DomCode::KEY_U,
+ ExpectUnicodeKeyFiltered(VKEY_U, DomCode::US_U,
EF_SHIFT_DOWN | EF_CONTROL_DOWN, 0x15);
- ExpectUnicodeKeyFiltered(VKEY_X, DomCode::KEY_X, 0, 'x');
+ ExpectUnicodeKeyFiltered(VKEY_X, DomCode::US_X, 0, 'x');
ExpectUnicodeKeyFiltered(VKEY_SPACE, DomCode::SPACE, EF_NONE, ' ');
EXPECT_TRUE(character_composer_.composed_character().empty());
// HIRAGANA LETTER A (U+3042) with a sequence [3, 0, x, 4, 2].
- ExpectUnicodeKeyFiltered(VKEY_U, DomCode::KEY_U,
+ ExpectUnicodeKeyFiltered(VKEY_U, DomCode::US_U,
EF_SHIFT_DOWN | EF_CONTROL_DOWN, 0x15);
ExpectUnicodeKeyFiltered(VKEY_3, DomCode::DIGIT3, EF_NONE, '3');
ExpectUnicodeKeyFiltered(VKEY_0, DomCode::DIGIT0, EF_NONE, '0');
- ExpectUnicodeKeyFiltered(VKEY_X, DomCode::KEY_X, EF_NONE, 'x');
+ ExpectUnicodeKeyFiltered(VKEY_X, DomCode::US_X, EF_NONE, 'x');
ExpectUnicodeKeyFiltered(VKEY_4, DomCode::DIGIT4, EF_NONE, '4');
ExpectUnicodeKeyFiltered(VKEY_2, DomCode::DIGIT2, EF_NONE, '2');
ExpectUnicodeKeyComposed(VKEY_SPACE, DomCode::SPACE, EF_NONE, ' ',
@@ -351,7 +351,7 @@ TEST_F(CharacterComposerTest, HexadecimalCompositionWithNonHexKey) {
TEST_F(CharacterComposerTest, HexadecimalCompositionWithAdditionalModifiers) {
// Ctrl+Shift+Alt+U
// HIRAGANA LETTER A (U+3042)
- ExpectUnicodeKeyFiltered(VKEY_U, DomCode::KEY_U,
+ ExpectUnicodeKeyFiltered(VKEY_U, DomCode::US_U,
EF_SHIFT_DOWN | EF_CONTROL_DOWN | EF_ALT_DOWN, 0x15);
ExpectUnicodeKeyFiltered(VKEY_3, DomCode::DIGIT3, EF_NONE, '3');
ExpectUnicodeKeyFiltered(VKEY_0, DomCode::DIGIT0, EF_NONE, '0');
@@ -362,13 +362,13 @@ TEST_F(CharacterComposerTest, HexadecimalCompositionWithAdditionalModifiers) {
// Ctrl+Shift+u (CapsLock enabled)
ExpectUnicodeKeyNotFiltered(
- VKEY_U, DomCode::KEY_U,
+ VKEY_U, DomCode::US_U,
EF_SHIFT_DOWN | EF_CONTROL_DOWN | EF_CAPS_LOCK_DOWN, 'u');
}
TEST_F(CharacterComposerTest, CancelHexadecimalComposition) {
// Cancel composition with ESC.
- ExpectUnicodeKeyFiltered(VKEY_U, DomCode::KEY_U,
+ ExpectUnicodeKeyFiltered(VKEY_U, DomCode::US_U,
EF_SHIFT_DOWN | EF_CONTROL_DOWN, 0x15);
ExpectUnicodeKeyFiltered(VKEY_1, DomCode::DIGIT1, 0, '1');
ExpectUnicodeKeyFiltered(VKEY_ESCAPE, DomCode::ESCAPE, EF_NONE, 0x1B);
@@ -376,7 +376,7 @@ TEST_F(CharacterComposerTest, CancelHexadecimalComposition) {
// Now we can start composition again since the last composition was
// cancelled.
// HIRAGANA LETTER A (U+3042)
- ExpectUnicodeKeyFiltered(VKEY_U, DomCode::KEY_U,
+ ExpectUnicodeKeyFiltered(VKEY_U, DomCode::US_U,
EF_SHIFT_DOWN | EF_CONTROL_DOWN, 0x15);
ExpectUnicodeKeyFiltered(VKEY_3, DomCode::DIGIT3, EF_NONE, '3');
ExpectUnicodeKeyFiltered(VKEY_0, DomCode::DIGIT0, EF_NONE, '0');
@@ -388,11 +388,11 @@ TEST_F(CharacterComposerTest, CancelHexadecimalComposition) {
TEST_F(CharacterComposerTest, HexadecimalCompositionWithBackspace) {
// HIRAGANA LETTER A (U+3042)
- ExpectUnicodeKeyFiltered(VKEY_U, DomCode::KEY_U,
+ ExpectUnicodeKeyFiltered(VKEY_U, DomCode::US_U,
EF_SHIFT_DOWN | EF_CONTROL_DOWN, 0x15);
ExpectUnicodeKeyFiltered(VKEY_3, DomCode::DIGIT3, 0, '3');
ExpectUnicodeKeyFiltered(VKEY_0, DomCode::DIGIT0, 0, '0');
- ExpectUnicodeKeyFiltered(VKEY_F, DomCode::KEY_F, 0, 'f');
+ ExpectUnicodeKeyFiltered(VKEY_F, DomCode::US_F, 0, 'f');
ExpectUnicodeKeyFiltered(VKEY_BACK, DomCode::BACKSPACE, EF_NONE, '\b');
ExpectUnicodeKeyFiltered(VKEY_4, DomCode::DIGIT4, EF_NONE, '4');
ExpectUnicodeKeyFiltered(VKEY_2, DomCode::DIGIT2, EF_NONE, '2');
@@ -402,13 +402,13 @@ TEST_F(CharacterComposerTest, HexadecimalCompositionWithBackspace) {
TEST_F(CharacterComposerTest, CancelHexadecimalCompositionWithBackspace) {
// Backspace just after Ctrl+Shift+U.
- ExpectUnicodeKeyFiltered(VKEY_U, DomCode::KEY_U,
+ ExpectUnicodeKeyFiltered(VKEY_U, DomCode::US_U,
EF_SHIFT_DOWN | EF_CONTROL_DOWN, 0x15);
ExpectUnicodeKeyFiltered(VKEY_BACK, DomCode::BACKSPACE, EF_NONE, '\b');
ExpectUnicodeKeyNotFiltered(VKEY_3, DomCode::DIGIT3, EF_NONE, '3');
// Backspace twice after Ctrl+Shift+U and 3.
- ExpectUnicodeKeyFiltered(VKEY_U, DomCode::KEY_U,
+ ExpectUnicodeKeyFiltered(VKEY_U, DomCode::US_U,
EF_SHIFT_DOWN | EF_CONTROL_DOWN, 0x15);
ExpectUnicodeKeyFiltered(VKEY_3, DomCode::DIGIT3, 0, '3');
ExpectUnicodeKeyFiltered(VKEY_BACK, DomCode::BACKSPACE, EF_NONE, '\b');
@@ -421,7 +421,7 @@ TEST_F(CharacterComposerTest,
// This test case supposes X Window System uses 101 keyboard layout.
const int kControlShift = EF_CONTROL_DOWN | EF_SHIFT_DOWN;
// HIRAGANA LETTER A (U+3042)
- ExpectUnicodeKeyFiltered(ui::VKEY_U, DomCode::KEY_U, kControlShift, 0x15);
+ ExpectUnicodeKeyFiltered(ui::VKEY_U, DomCode::US_U, kControlShift, 0x15);
EXPECT_EQ(ASCIIToUTF16("u"), character_composer_.preedit_string());
ExpectUnicodeKeyFiltered(ui::VKEY_3, DomCode::DIGIT3, kControlShift, '#');
EXPECT_EQ(ASCIIToUTF16("u3"), character_composer_.preedit_string());
@@ -429,7 +429,7 @@ TEST_F(CharacterComposerTest,
EXPECT_EQ(ASCIIToUTF16("u30"), character_composer_.preedit_string());
ExpectUnicodeKeyFiltered(ui::VKEY_4, DomCode::DIGIT4, kControlShift, '$');
EXPECT_EQ(ASCIIToUTF16("u304"), character_composer_.preedit_string());
- ExpectUnicodeKeyFiltered(ui::VKEY_A, DomCode::KEY_A, kControlShift, 0x01);
+ ExpectUnicodeKeyFiltered(ui::VKEY_A, DomCode::US_A, kControlShift, 0x01);
EXPECT_EQ(ASCIIToUTF16("u304a"), character_composer_.preedit_string());
ExpectUnicodeKeyFiltered(ui::VKEY_BACK, DomCode::BACKSPACE, kControlShift,
'\b');
@@ -442,13 +442,13 @@ TEST_F(CharacterComposerTest,
EXPECT_EQ(ASCIIToUTF16(""), character_composer_.preedit_string());
// Sequence with an ignored character (control + shift + 'x') and Escape.
- ExpectUnicodeKeyFiltered(ui::VKEY_U, DomCode::KEY_U, kControlShift, 'U');
+ ExpectUnicodeKeyFiltered(ui::VKEY_U, DomCode::US_U, kControlShift, 'U');
EXPECT_EQ(ASCIIToUTF16("u"), character_composer_.preedit_string());
ExpectUnicodeKeyFiltered(ui::VKEY_3, DomCode::DIGIT3, kControlShift, '#');
EXPECT_EQ(ASCIIToUTF16("u3"), character_composer_.preedit_string());
ExpectUnicodeKeyFiltered(ui::VKEY_0, DomCode::DIGIT0, kControlShift, ')');
EXPECT_EQ(ASCIIToUTF16("u30"), character_composer_.preedit_string());
- ExpectUnicodeKeyFiltered(ui::VKEY_X, DomCode::KEY_X, kControlShift, 'X');
+ ExpectUnicodeKeyFiltered(ui::VKEY_X, DomCode::US_X, kControlShift, 'X');
EXPECT_EQ(ASCIIToUTF16("u30"), character_composer_.preedit_string());
ExpectUnicodeKeyFiltered(ui::VKEY_4, DomCode::DIGIT4, kControlShift, '$');
EXPECT_EQ(ASCIIToUTF16("u304"), character_composer_.preedit_string());
@@ -461,31 +461,31 @@ TEST_F(CharacterComposerTest,
TEST_F(CharacterComposerTest, InvalidHexadecimalSequence) {
// U+FFFFFFFF
- ExpectUnicodeKeyFiltered(VKEY_U, DomCode::KEY_U,
+ ExpectUnicodeKeyFiltered(VKEY_U, DomCode::US_U,
EF_SHIFT_DOWN | EF_CONTROL_DOWN, 0x15);
for (int i = 0; i < 8; ++i)
- ExpectUnicodeKeyFiltered(VKEY_F, DomCode::KEY_F, 0, 'f');
+ ExpectUnicodeKeyFiltered(VKEY_F, DomCode::US_F, 0, 'f');
ExpectUnicodeKeyFiltered(VKEY_SPACE, DomCode::SPACE, EF_NONE, ' ');
// U+0000 (Actually, this is a valid unicode character, but we don't
// compose a string with a character '\0')
- ExpectUnicodeKeyFiltered(VKEY_U, DomCode::KEY_U,
+ ExpectUnicodeKeyFiltered(VKEY_U, DomCode::US_U,
EF_SHIFT_DOWN | EF_CONTROL_DOWN, 0x15);
for (int i = 0; i < 4; ++i)
ExpectUnicodeKeyFiltered(VKEY_0, DomCode::DIGIT0, 0, '0');
ExpectUnicodeKeyFiltered(VKEY_SPACE, DomCode::SPACE, EF_NONE, ' ');
// U+10FFFF
- ExpectUnicodeKeyFiltered(VKEY_U, DomCode::KEY_U,
+ ExpectUnicodeKeyFiltered(VKEY_U, DomCode::US_U,
EF_SHIFT_DOWN | EF_CONTROL_DOWN, 0x15);
ExpectUnicodeKeyFiltered(VKEY_1, DomCode::DIGIT1, 0, '1');
ExpectUnicodeKeyFiltered(VKEY_0, DomCode::DIGIT0, 0, '0');
for (int i = 0; i < 4; ++i)
- ExpectUnicodeKeyFiltered(VKEY_F, DomCode::KEY_F, 0, 'f');
+ ExpectUnicodeKeyFiltered(VKEY_F, DomCode::US_F, 0, 'f');
ExpectUnicodeKeyFiltered(VKEY_SPACE, DomCode::SPACE, EF_NONE, ' ');
// U+110000
- ExpectUnicodeKeyFiltered(VKEY_U, DomCode::KEY_U,
+ ExpectUnicodeKeyFiltered(VKEY_U, DomCode::US_U,
EF_SHIFT_DOWN | EF_CONTROL_DOWN, 0x15);
ExpectUnicodeKeyFiltered(VKEY_1, DomCode::DIGIT1, 0, '1');
ExpectUnicodeKeyFiltered(VKEY_1, DomCode::DIGIT1, 0, '1');
@@ -497,10 +497,10 @@ TEST_F(CharacterComposerTest, InvalidHexadecimalSequence) {
TEST_F(CharacterComposerTest, HexadecimalSequenceAndDeadKey) {
// LATIN SMALL LETTER A WITH ACUTE
ExpectDeadKeyFiltered(kCombiningAcute);
- ExpectUnicodeKeyComposed(VKEY_A, DomCode::KEY_A, EF_NONE, 'a',
+ ExpectUnicodeKeyComposed(VKEY_A, DomCode::US_A, EF_NONE, 'a',
base::string16(1, 0x00E1));
// HIRAGANA LETTER A (U+3042) with dead_acute ignored.
- ExpectUnicodeKeyFiltered(VKEY_U, DomCode::KEY_U,
+ ExpectUnicodeKeyFiltered(VKEY_U, DomCode::US_U,
EF_SHIFT_DOWN | EF_CONTROL_DOWN, 0x15);
ExpectUnicodeKeyFiltered(VKEY_3, DomCode::DIGIT3, EF_NONE, '3');
ExpectUnicodeKeyFiltered(VKEY_0, DomCode::DIGIT0, EF_NONE, '0');
« no previous file with comments | « remoting/test/app_remoting_latency_test_fixture.cc ('k') | ui/events/event.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698