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

Unified Diff: chrome/test/chromedriver/key_converter_unittest.cc

Issue 113403006: Update some uses of char16 to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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 | « chrome/test/chromedriver/key_converter.cc ('k') | chrome/test/chromedriver/keycode_text_conversion.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/chromedriver/key_converter_unittest.cc
diff --git a/chrome/test/chromedriver/key_converter_unittest.cc b/chrome/test/chromedriver/key_converter_unittest.cc
index 21a3c5f1ee7a1c513db5f981d56db722df8751b6..7cfcb52eb6ad8b39b7612f67b3622789d133218a 100644
--- a/chrome/test/chromedriver/key_converter_unittest.cc
+++ b/chrome/test/chromedriver/key_converter_unittest.cc
@@ -136,7 +136,7 @@ TEST(KeyConverter, WebDriverSpecialChar) {
CreateCharEvent(" ", " ", 0),
CreateKeyUpEvent(ui::VKEY_SPACE, 0)};
base::string16 keys;
- keys.push_back(static_cast<char16>(0xE00DU));
+ keys.push_back(static_cast<base::char16>(0xE00DU));
CheckEventsReleaseModifiers(keys, event_array, arraysize(event_array));
}
@@ -145,7 +145,7 @@ TEST(KeyConverter, WebDriverSpecialNonCharKey) {
CreateKeyDownEvent(ui::VKEY_F1, 0),
CreateKeyUpEvent(ui::VKEY_F1, 0)};
base::string16 keys;
- keys.push_back(static_cast<char16>(0xE031U));
+ keys.push_back(static_cast<base::char16>(0xE031U));
CheckEventsReleaseModifiers(keys, event_array, arraysize(event_array));
}
@@ -210,7 +210,7 @@ TEST(KeyConverter, UppercaseCharUsesShiftOnlyIfNecessary) {
CreateKeyUpEvent(ui::VKEY_C, kShiftKeyModifierMask),
CreateKeyUpEvent(ui::VKEY_SHIFT, 0)};
base::string16 keys;
- keys.push_back(static_cast<char16>(0xE008U));
+ keys.push_back(static_cast<base::char16>(0xE008U));
keys.append(base::UTF8ToUTF16("aBc"));
CheckEventsReleaseModifiers(keys, event_array, arraysize(event_array));
}
@@ -226,14 +226,14 @@ TEST(KeyConverter, ToggleModifiers) {
CreateKeyDownEvent(ui::VKEY_COMMAND, kMetaKeyModifierMask),
CreateKeyUpEvent(ui::VKEY_COMMAND, 0)};
base::string16 keys;
- keys.push_back(static_cast<char16>(0xE008U));
- keys.push_back(static_cast<char16>(0xE008U));
- keys.push_back(static_cast<char16>(0xE009U));
- keys.push_back(static_cast<char16>(0xE009U));
- keys.push_back(static_cast<char16>(0xE00AU));
- keys.push_back(static_cast<char16>(0xE00AU));
- keys.push_back(static_cast<char16>(0xE03DU));
- keys.push_back(static_cast<char16>(0xE03DU));
+ keys.push_back(static_cast<base::char16>(0xE008U));
+ keys.push_back(static_cast<base::char16>(0xE008U));
+ keys.push_back(static_cast<base::char16>(0xE009U));
+ keys.push_back(static_cast<base::char16>(0xE009U));
+ keys.push_back(static_cast<base::char16>(0xE00AU));
+ keys.push_back(static_cast<base::char16>(0xE00AU));
+ keys.push_back(static_cast<base::char16>(0xE03DU));
+ keys.push_back(static_cast<base::char16>(0xE03DU));
CheckEventsReleaseModifiers(keys, event_array, arraysize(event_array));
}
@@ -387,10 +387,10 @@ TEST(KeyConverter, ModifiersState) {
CreateKeyDownEvent(ui::VKEY_MENU, alt_key_modifier),
CreateKeyDownEvent(ui::VKEY_COMMAND, meta_key_modifier)};
base::string16 keys;
- keys.push_back(static_cast<char16>(0xE008U));
- keys.push_back(static_cast<char16>(0xE009U));
- keys.push_back(static_cast<char16>(0xE00AU));
- keys.push_back(static_cast<char16>(0xE03DU));
+ keys.push_back(static_cast<base::char16>(0xE008U));
+ keys.push_back(static_cast<base::char16>(0xE009U));
+ keys.push_back(static_cast<base::char16>(0xE00AU));
+ keys.push_back(static_cast<base::char16>(0xE03DU));
CheckEvents(keys, event_array, false /* release_modifiers */,
arraysize(event_array), meta_key_modifier);
@@ -404,8 +404,8 @@ TEST(KeyConverter, ReleaseModifiers) {
CreateKeyUpEvent(ui::VKEY_SHIFT, 0),
CreateKeyUpEvent(ui::VKEY_CONTROL, 0)};
base::string16 keys;
- keys.push_back(static_cast<char16>(0xE008U));
- keys.push_back(static_cast<char16>(0xE009U));
+ keys.push_back(static_cast<base::char16>(0xE008U));
+ keys.push_back(static_cast<base::char16>(0xE009U));
CheckEvents(keys, event_array, true /* release_modifiers */,
arraysize(event_array), 0);
« no previous file with comments | « chrome/test/chromedriver/key_converter.cc ('k') | chrome/test/chromedriver/keycode_text_conversion.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698