diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-24 23:12:15 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-24 23:12:15 +0000 |
| commit | cc2a2a22ebb171ff4c1eb528b3f8d7e551512732 (patch) | |
| tree | 9a010de6ab6210b43e4bc7cfa187ef3a80312a0b /chrome/browser/chromeos/input_method/textinput_surroundingtext_browsertest.cc | |
| parent | 8af3b22a0f64133ba32f4deaedc6540060520ff7 (diff) | |
| download | chromium_src-cc2a2a22ebb171ff4c1eb528b3f8d7e551512732.zip chromium_src-cc2a2a22ebb171ff4c1eb528b3f8d7e551512732.tar.gz chromium_src-cc2a2a22ebb171ff4c1eb528b3f8d7e551512732.tar.bz2 | |
Revert 242455 "Revert 242449 "Update some uses of UTF conversion..."
> Revert 242449 "Update some uses of UTF conversions in chrome/bro..."
>
> > Update some uses of UTF conversions in chrome/browser to use the base:: namespace.
> >
> > BUG=330556
> > TEST=no change
> > TBR=ben@chromium.org
> >
> > Review URL: https://codereview.chromium.org/120943002
>
> TBR=avi@chromium.org
>
> Review URL: https://codereview.chromium.org/103853007
TBR=avi@chromium.org
Review URL: https://codereview.chromium.org/120993002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242463 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/input_method/textinput_surroundingtext_browsertest.cc')
| -rw-r--r-- | chrome/browser/chromeos/input_method/textinput_surroundingtext_browsertest.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/chromeos/input_method/textinput_surroundingtext_browsertest.cc b/chrome/browser/chromeos/input_method/textinput_surroundingtext_browsertest.cc index a56dc60..d8ac3f0 100644 --- a/chrome/browser/chromeos/input_method/textinput_surroundingtext_browsertest.cc +++ b/chrome/browser/chromeos/input_method/textinput_surroundingtext_browsertest.cc @@ -34,8 +34,8 @@ IN_PROC_BROWSER_TEST_F(TextInput_SurroundingTextChangedTest, helper.WaitForTextInputStateChanged(ui::TEXT_INPUT_TYPE_TEXT_AREA); EXPECT_EQ(ui::TEXT_INPUT_TYPE_TEXT_AREA, helper.GetTextInputType()); - const base::string16 sample_text1 = UTF8ToUTF16("abcde"); - const base::string16 sample_text2 = UTF8ToUTF16("fghij"); + const base::string16 sample_text1 = base::UTF8ToUTF16("abcde"); + const base::string16 sample_text2 = base::UTF8ToUTF16("fghij"); const base::string16 surrounding_text2 = sample_text1 + sample_text2; gfx::Range expected_range1(5, 5); gfx::Range expected_range2(10, 10); @@ -71,7 +71,7 @@ IN_PROC_BROWSER_TEST_F(TextInput_SurroundingTextChangedTest, helper.WaitForTextInputStateChanged(ui::TEXT_INPUT_TYPE_TEXT_AREA); EXPECT_EQ(ui::TEXT_INPUT_TYPE_TEXT_AREA, helper.GetTextInputType()); - const base::string16 sample_text = UTF8ToUTF16("abcde"); + const base::string16 sample_text = base::UTF8ToUTF16("abcde"); gfx::Range expected_range(5, 5); ui::CompositionText composition_text; @@ -109,13 +109,13 @@ IN_PROC_BROWSER_TEST_F(TextInput_SurroundingTextChangedTest, helper.ClickElement("empty_textarea", tab); helper.WaitForTextInputStateChanged(ui::TEXT_INPUT_TYPE_TEXT_AREA); EXPECT_EQ(ui::TEXT_INPUT_TYPE_TEXT_AREA, helper.GetTextInputType()); - helper.WaitForSurroundingTextChanged(UTF8ToUTF16(""), zero_range); + helper.WaitForSurroundingTextChanged(base::string16(), zero_range); EXPECT_TRUE(helper.GetSurroundingText().empty()); EXPECT_EQ(zero_range, helper.GetSelectionRange()); // Click textarea containing text, so expecting new surrounding text comes. helper.ClickElement("filled_textarea", tab); - const base::string16 expected_text = UTF8ToUTF16("abcde"); + const base::string16 expected_text = base::UTF8ToUTF16("abcde"); const gfx::Range expected_range(5, 5); helper.WaitForSurroundingTextChanged(expected_text, expected_range); EXPECT_EQ(expected_text, helper.GetSurroundingText()); @@ -125,7 +125,7 @@ IN_PROC_BROWSER_TEST_F(TextInput_SurroundingTextChangedTest, helper.ClickElement("empty_textarea", tab); helper.WaitForTextInputStateChanged(ui::TEXT_INPUT_TYPE_TEXT_AREA); EXPECT_EQ(ui::TEXT_INPUT_TYPE_TEXT_AREA, helper.GetTextInputType()); - helper.WaitForSurroundingTextChanged(UTF8ToUTF16(""), zero_range); + helper.WaitForSurroundingTextChanged(base::string16(), zero_range); EXPECT_TRUE(helper.GetSurroundingText().empty()); EXPECT_EQ(zero_range, helper.GetSelectionRange()); } |