| Index: chrome/browser/extensions/key_identifier_conversion_views_unittest.cc
|
| ===================================================================
|
| --- chrome/browser/extensions/key_identifier_conversion_views_unittest.cc (revision 74326)
|
| +++ chrome/browser/extensions/key_identifier_conversion_views_unittest.cc (working copy)
|
| @@ -23,40 +23,40 @@
|
| };
|
|
|
| TEST_F(KeyEventFromKeyIdentifierTest, MatchOnIdentifier) {
|
| - EXPECT_EQ(ui::VKEY_APPS, KeyEventFromKeyIdentifier("Apps").GetKeyCode());
|
| + EXPECT_EQ(ui::VKEY_APPS, KeyEventFromKeyIdentifier("Apps").key_code());
|
| EXPECT_EQ(ui::VKEY_UNKNOWN,
|
| - KeyEventFromKeyIdentifier("Nonsense").GetKeyCode());
|
| + KeyEventFromKeyIdentifier("Nonsense").key_code());
|
| }
|
|
|
| TEST_F(KeyEventFromKeyIdentifierTest, MatchOnCharacter) {
|
| - EXPECT_EQ(ui::VKEY_A, KeyEventFromKeyIdentifier("a").GetKeyCode());
|
| - EXPECT_EQ(ui::VKEY_A, KeyEventFromKeyIdentifier("A").GetKeyCode());
|
| - EXPECT_EQ(ui::VKEY_OEM_PERIOD, KeyEventFromKeyIdentifier(">").GetKeyCode());
|
| + EXPECT_EQ(ui::VKEY_A, KeyEventFromKeyIdentifier("a").key_code());
|
| + EXPECT_EQ(ui::VKEY_A, KeyEventFromKeyIdentifier("A").key_code());
|
| + EXPECT_EQ(ui::VKEY_OEM_PERIOD, KeyEventFromKeyIdentifier(">").key_code());
|
|
|
| std::string non_printing_char(" ");
|
| non_printing_char[0] = static_cast<char>(1);
|
| EXPECT_EQ(ui::VKEY_UNKNOWN,
|
| - KeyEventFromKeyIdentifier(non_printing_char).GetKeyCode());
|
| + KeyEventFromKeyIdentifier(non_printing_char).key_code());
|
| }
|
|
|
| TEST_F(KeyEventFromKeyIdentifierTest, MatchOnUnicodeCodepoint) {
|
| - EXPECT_EQ(ui::VKEY_A, KeyEventFromKeyIdentifier("U+0041").GetKeyCode());
|
| - EXPECT_EQ(ui::VKEY_A, KeyEventFromKeyIdentifier("U+0061").GetKeyCode());
|
| - EXPECT_EQ(ui::VKEY_DELETE, KeyEventFromKeyIdentifier("U+007F").GetKeyCode());
|
| + EXPECT_EQ(ui::VKEY_A, KeyEventFromKeyIdentifier("U+0041").key_code());
|
| + EXPECT_EQ(ui::VKEY_A, KeyEventFromKeyIdentifier("U+0061").key_code());
|
| + EXPECT_EQ(ui::VKEY_DELETE, KeyEventFromKeyIdentifier("U+007F").key_code());
|
|
|
| // this one exists in the map, but has no valid ui::VKEY
|
| - EXPECT_EQ(ui::VKEY_UNKNOWN, KeyEventFromKeyIdentifier("U+030A").GetKeyCode());
|
| + EXPECT_EQ(ui::VKEY_UNKNOWN, KeyEventFromKeyIdentifier("U+030A").key_code());
|
|
|
| // this one is not in the map
|
| - EXPECT_EQ(ui::VKEY_UNKNOWN, KeyEventFromKeyIdentifier("U+0001").GetKeyCode());
|
| + EXPECT_EQ(ui::VKEY_UNKNOWN, KeyEventFromKeyIdentifier("U+0001").key_code());
|
| }
|
|
|
| TEST_F(KeyEventFromKeyIdentifierTest, DoesNotMatchEmptyString) {
|
| - EXPECT_EQ(ui::VKEY_UNKNOWN, KeyEventFromKeyIdentifier("").GetKeyCode());
|
| + EXPECT_EQ(ui::VKEY_UNKNOWN, KeyEventFromKeyIdentifier("").key_code());
|
| }
|
|
|
| TEST_F(KeyEventFromKeyIdentifierTest, ShiftModifiersAreSet) {
|
| - EXPECT_EQ(0, KeyEventFromKeyIdentifier("1").GetFlags());
|
| + EXPECT_EQ(0, KeyEventFromKeyIdentifier("1").flags());
|
|
|
| const char* keys_with_shift[] = {
|
| "~", "!", "@", "#", "$", "%", "^", "&", "*", "(", ")", "_", "+",
|
| @@ -66,7 +66,7 @@
|
|
|
| for (int i = 0; i < kNumKeysWithShift; ++i) {
|
| EXPECT_EQ(views::Event::EF_SHIFT_DOWN,
|
| - KeyEventFromKeyIdentifier(keys_with_shift[i]).GetFlags());
|
| + KeyEventFromKeyIdentifier(keys_with_shift[i]).flags());
|
| }
|
| }
|
|
|
|
|