Refactor WordIterator into base::BreakIterator....

base/i18n/break_iterator.h

Index: base/i18n/break_iterator.h
===================================================================
--- base/i18n/break_iterator.h	(revision 68907)
+++ base/i18n/break_iterator.h	(working copy)
@@ -2,19 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef BASE_I18N_WORD_ITERATOR_H_
-#define BASE_I18N_WORD_ITERATOR_H_
+#ifndef BASE_I18N_BREAK_ITERATOR_H_
+#define BASE_I18N_BREAK_ITERATOR_H_
 #pragma once
 
-#include <vector>
-
 #include "base/basictypes.h"
 #include "base/string16.h"
 
-// The WordIterator class iterates through the words and word breaks
+// The BreakIterator class iterates through the words and word breaks
 // in a UTF-16 string.
 //
-// It provides two modes, BREAK_WORD and BREAK_LINE, which modify how
+// It provides two modes, BREAK_WORD and BREAK_SPACE, which modify how
 // trailing non-word characters are aggregated into the returned word.
 //
 // Under BREAK_WORD mode (more common), the non-word characters are
@@ -22,14 +20,14 @@
 // the string " foo bar! ", the word breaks are at the periods in
 // ". .foo. .bar.!. .").
 //
-// Under BREAK_LINE mode (less common), the non-word characters are
+// Under BREAK_SPACE mode (less common), the non-word characters are
 // included in the word, breaking only when a space-equivalent character
 // is encountered (e.g. in the UTF16-equivalent of the string " foo bar! ",
 // the word breaks are at the periods in ". .foo .bar! .").
 //
-// To extract the words from a string, move a BREAK_WORD WordIterator
+// To extract the words from a string, move a BREAK_WORD BreakIterator
 // through the string and test whether IsWord() is true.  E.g.,
-//   WordIterator iter(&str, WordIterator::BREAK_WORD);
+//   BreakIterator iter(&str, BreakIterator::BREAK_WORD);
 //   if (!iter.Init()) return false;
 //   while (iter.Advance()) {
 //     if (iter.IsWord()) {
@@ -38,24 +36,25 @@
 //     }
 //   }
 
+namespace base {  // Prevent conflict with ICU BreakIterator

[Evan Martin, 2010/12/13 20:26:04]

I guess this comment isn't necessary -- it's implicit that stuff in base belongs
in base.

 
-class WordIterator {
+class BreakIterator {
  public:
   enum BreakType {
     BREAK_WORD,
-    BREAK_LINE
+    BREAK_SPACE
   };
 
-  // Requires |str| to live as long as the WordIterator does.
-  WordIterator(const string16* str, BreakType break_type);
-  ~WordIterator();
+  // Requires |str| to live as long as the BreakIterator does.
+  BreakIterator(const string16* str, BreakType break_type);
+  ~BreakIterator();
 
   // Init() must be called before any of the iterators are valid.
   // Returns false if ICU failed to initialize.
   bool Init();
 
   // Return the current break position within the string,
-  // or WordIterator::npos when done.
+  // or BreakIterator::npos when done.
   size_t pos() const { return pos_; }
   // Return the value of pos() returned before Advance() was last called.
   size_t prev() const { return prev_; }
@@ -92,7 +91,9 @@
   // Previous and current iterator positions.
   size_t prev_, pos_;
 
-  DISALLOW_COPY_AND_ASSIGN(WordIterator);
+  DISALLOW_COPY_AND_ASSIGN(BreakIterator);
 };
 
-#endif  // BASE_I18N_WORD_ITERATOR_H__
+}  // namespace base
+
+#endif  // BASE_I18N_BREAK_ITERATOR_H__