| Index: ui/views/controls/textfield/native_textfield_views_unittest.cc
|
| diff --git a/ui/views/controls/textfield/native_textfield_views_unittest.cc b/ui/views/controls/textfield/native_textfield_views_unittest.cc
|
| index aa926a7a97e9c73cb1ea01f14f360b719771c9c4..a0376e5ddffcd353452c627c14bd2ee2a3907e8c 100644
|
| --- a/ui/views/controls/textfield/native_textfield_views_unittest.cc
|
| +++ b/ui/views/controls/textfield/native_textfield_views_unittest.cc
|
| @@ -47,7 +47,7 @@
|
|
|
| namespace {
|
|
|
| -const char16 kHebrewLetterSamekh = 0x05E1;
|
| +const base::char16 kHebrewLetterSamekh = 0x05E1;
|
|
|
| // A Textfield wrapper to intercept OnKey[Pressed|Released]() ressults.
|
| class TestTextfield : public views::Textfield {
|
| @@ -232,7 +232,7 @@ class NativeTextfieldViewsTest : public ViewsTestBase,
|
| SendKeyEvent(key_code, false, false);
|
| }
|
|
|
| - void SendKeyEvent(char16 ch) {
|
| + void SendKeyEvent(base::char16 ch) {
|
| if (ch < 0x80) {
|
| ui::KeyboardCode code =
|
| ch == ' ' ? ui::VKEY_SPACE :
|
| @@ -1804,7 +1804,7 @@ TEST_F(NativeTextfieldViewsTest, GetCompositionCharacterBoundsTest) {
|
| TEST_F(NativeTextfieldViewsTest, GetCompositionCharacterBounds_ComplexText) {
|
| InitTextfield(Textfield::STYLE_DEFAULT);
|
|
|
| - const char16 kUtf16Chars[] = {
|
| + const base::char16 kUtf16Chars[] = {
|
| // U+0020 SPACE
|
| 0x0020,
|
| // U+1F408 (CAT) as surrogate pair
|
|
|