| Index: chrome/renderer/spellchecker/spellcheck_worditerator_unittest.cc
|
| diff --git a/chrome/renderer/spellchecker/spellcheck_worditerator_unittest.cc b/chrome/renderer/spellchecker/spellcheck_worditerator_unittest.cc
|
| index fe04f44a077331d87cb2f36530a85a08167017e5..c1e5fce95844cfdbe78a349291c7850000a7e68e 100644
|
| --- a/chrome/renderer/spellchecker/spellcheck_worditerator_unittest.cc
|
| +++ b/chrome/renderer/spellchecker/spellcheck_worditerator_unittest.cc
|
| @@ -119,17 +119,17 @@ TEST(SpellcheckWordIteratorTest, SplitWord) {
|
| SpellcheckCharAttribute attributes;
|
| attributes.SetDefaultLanguage(kTestCases[i].language);
|
|
|
| - string16 input(WideToUTF16(kTestText));
|
| + base::string16 input(WideToUTF16(kTestText));
|
| SpellcheckWordIterator iterator;
|
| EXPECT_TRUE(iterator.Initialize(&attributes,
|
| kTestCases[i].allow_contraction));
|
| EXPECT_TRUE(iterator.SetText(input.c_str(), input.length()));
|
|
|
| - std::vector<string16> expected_words;
|
| + std::vector<base::string16> expected_words;
|
| base::SplitString(
|
| WideToUTF16(kTestCases[i].expected_words), ' ', &expected_words);
|
|
|
| - string16 actual_word;
|
| + base::string16 actual_word;
|
| int actual_start, actual_end;
|
| size_t index = 0;
|
| while (iterator.GetNextWord(&actual_word, &actual_start, &actual_end)) {
|
| @@ -149,7 +149,7 @@ TEST(SpellcheckWordIteratorTest, RuleSetConsistency) {
|
| attributes.SetDefaultLanguage("en-US");
|
|
|
| const wchar_t kTestText[] = L"\x1791\x17c1\x002e";
|
| - string16 input(WideToUTF16(kTestText));
|
| + base::string16 input(WideToUTF16(kTestText));
|
|
|
| SpellcheckWordIterator iterator;
|
| EXPECT_TRUE(iterator.Initialize(&attributes, true));
|
| @@ -158,7 +158,7 @@ TEST(SpellcheckWordIteratorTest, RuleSetConsistency) {
|
| // When SpellcheckWordIterator uses an inconsistent ICU ruleset, the following
|
| // iterator.GetNextWord() call gets stuck in an infinite loop. Therefore, this
|
| // test succeeds if this call returns without timeouts.
|
| - string16 actual_word;
|
| + base::string16 actual_word;
|
| int actual_start, actual_end;
|
| EXPECT_FALSE(iterator.GetNextWord(&actual_word, &actual_start, &actual_end));
|
| EXPECT_EQ(0, actual_start);
|
| @@ -214,12 +214,12 @@ TEST(SpellcheckWordIteratorTest, TreatNumbersAsWordCharacters) {
|
| SpellcheckCharAttribute attributes;
|
| attributes.SetDefaultLanguage(kTestCases[i].language);
|
|
|
| - string16 input_word(WideToUTF16(kTestCases[i].text));
|
| + base::string16 input_word(WideToUTF16(kTestCases[i].text));
|
| SpellcheckWordIterator iterator;
|
| EXPECT_TRUE(iterator.Initialize(&attributes, true));
|
| EXPECT_TRUE(iterator.SetText(input_word.c_str(), input_word.length()));
|
|
|
| - string16 actual_word;
|
| + base::string16 actual_word;
|
| int actual_start, actual_end;
|
| EXPECT_TRUE(iterator.GetNextWord(&actual_word, &actual_start, &actual_end));
|
| if (kTestCases[i].left_to_right)
|
|
|