chrome/browser/chromeos/input_method/textinput_surroundingtext_browsertest.cc - Issue 105193002: Replace string16 with base::string16.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/input_method/textinput_surroundingtext_browsertest.cc

Issue 105193002: Replace string16 with base::string16. (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/browser/chromeos/input_method/mode_indicator_delegate_view.cc ('k') | chrome/browser/chromeos/input_method/textinput_test_helper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/input_method/textinput_surroundingtext_browsertest.cc

diff --git a/chrome/browser/chromeos/input_method/textinput_surroundingtext_browsertest.cc b/chrome/browser/chromeos/input_method/textinput_surroundingtext_browsertest.cc

index d0351bdffc42ac372a58b694c23cf0adda221e67..a56dc6065b8065829b4f8671c4b9b6cd0b09bde7 100644

--- a/chrome/browser/chromeos/input_method/textinput_surroundingtext_browsertest.cc

+++ b/chrome/browser/chromeos/input_method/textinput_surroundingtext_browsertest.cc

@@ -34,9 +34,9 @@ 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 string16 sample_text1 = UTF8ToUTF16("abcde");

- const string16 sample_text2 = UTF8ToUTF16("fghij");

- const string16 surrounding_text2 = sample_text1 + sample_text2;

+ const base::string16 sample_text1 = UTF8ToUTF16("abcde");

+ const base::string16 sample_text2 = 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 string16 sample_text = UTF8ToUTF16("abcde");

+ const base::string16 sample_text = UTF8ToUTF16("abcde");

gfx::Range expected_range(5, 5);

ui::CompositionText composition_text;

@@ -115,7 +115,7 @@ IN_PROC_BROWSER_TEST_F(TextInput_SurroundingTextChangedTest,

// Click textarea containing text, so expecting new surrounding text comes.

helper.ClickElement("filled_textarea", tab);

- const string16 expected_text = UTF8ToUTF16("abcde");

+ const base::string16 expected_text = UTF8ToUTF16("abcde");

const gfx::Range expected_range(5, 5);

helper.WaitForSurroundingTextChanged(expected_text, expected_range);

EXPECT_EQ(expected_text, helper.GetSurroundingText());