Refactor WordIterator into base::BreakIterator....

base/i18n/break_iterator_unittest.cc

Index: base/i18n/break_iterator_unittest.cc
===================================================================
--- base/i18n/break_iterator_unittest.cc	(revision 68907)
+++ base/i18n/break_iterator_unittest.cc	(working copy)
@@ -2,18 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/i18n/word_iterator.h"
+#include "base/i18n/break_iterator.h"
 
 #include "base/string_piece.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-TEST(WordIteratorTest, BreakWord) {
+TEST(BreakIteratorTest, BreakWord) {
   string16 space(UTF8ToUTF16(" "));
 
   string16 str(UTF8ToUTF16(" foo bar! \npouet boom"));
-  WordIterator iter(&str, WordIterator::BREAK_WORD);
+  base::BreakIterator iter(&str, base::BreakIterator::BREAK_WORD);
   ASSERT_TRUE(iter.Init());
   EXPECT_TRUE(iter.Advance());
   EXPECT_FALSE(iter.IsWord());
@@ -49,9 +49,9 @@
   EXPECT_FALSE(iter.IsWord());
 }
 
-TEST(WordIteratorTest, BreakLine) {
+TEST(BreakIteratorTest, BreakLine) {
   string16 str(UTF8ToUTF16(" foo bar! \npouet boom"));
-  WordIterator iter(&str, WordIterator::BREAK_LINE);
+  base::BreakIterator iter(&str, base::BreakIterator::BREAK_SPACE);
   ASSERT_TRUE(iter.Init());
   EXPECT_TRUE(iter.Advance());
   EXPECT_FALSE(iter.IsWord());
@@ -72,14 +72,14 @@
   EXPECT_FALSE(iter.IsWord());
 }
 
-TEST(WordIteratorTest, BreakWide16) {
+TEST(BreakIteratorTest, BreakWide16) {
   //  "Παγκόσμιος Ιστός"
   const string16 str(WideToUTF16(
       L"\x03a0\x03b1\x03b3\x03ba\x03cc\x03c3\x03bc\x03b9"
       L"\x03bf\x03c2\x0020\x0399\x03c3\x03c4\x03cc\x03c2"));
   const string16 word1(str.substr(0, 10));
   const string16 word2(str.substr(11, 5));
-  WordIterator iter(&str, WordIterator::BREAK_WORD);
+  base::BreakIterator iter(&str, base::BreakIterator::BREAK_WORD);
   ASSERT_TRUE(iter.Init());
   EXPECT_TRUE(iter.Advance());
   EXPECT_TRUE(iter.IsWord());
@@ -94,14 +94,14 @@
   EXPECT_FALSE(iter.IsWord());
 }
 
-TEST(WordIteratorTest, BreakWide32) {
+TEST(BreakIteratorTest, BreakWide32) {
   // U+1D49C MATHEMATICAL SCRIPT CAPITAL A
   const char* very_wide_char = "\xF0\x9D\x92\x9C";
   const string16 str(
       UTF8ToUTF16(StringPrintf("%s a", very_wide_char)));
   const string16 very_wide_word(str.substr(0, 2));
 
-  WordIterator iter(&str, WordIterator::BREAK_WORD);
+  base::BreakIterator iter(&str, base::BreakIterator::BREAK_WORD);
   ASSERT_TRUE(iter.Init());
   EXPECT_TRUE(iter.Advance());
   EXPECT_TRUE(iter.IsWord());