Refactor code to avoid direct dependency upon ICU: spellcheck_worditerator

chrome/renderer/spellchecker/spellcheck_worditerator.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Defines an iterator class that enumerates words supported by our spellchecker
 // from multi-language text. This class is used for filtering out characters
 // not supported by our spellchecker.
 
 #ifndef CHROME_RENDERER_SPELLCHECKER_SPELLCHECK_WORDITERATOR_H_
 #define CHROME_RENDERER_SPELLCHECKER_SPELLCHECK_WORDITERATOR_H_
 
 #include <string>
 
 #include "base/basictypes.h"
+#include "base/i18n/break_iterator.h"

[groby-ooo-7-16, 2014/05/08 17:52:00]

If you forward declare BreakIterator, you don't need this.

[Andrew Hayden (chromium.org), 2014/05/09 15:16:16]

Done.

+#include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
-#include "third_party/icu/source/common/unicode/ubrk.h"
 #include "third_party/icu/source/common/unicode/uscript.h"
 
 // A class which encapsulates language-specific operations used by
 // SpellcheckWordIterator. When we set the spellchecker language, this class
 // creates rule sets that filter out the characters not supported by the
 // spellchecker. (Please read the comment in the SpellcheckWordIterator class
 // about how to use this class.)
 class SpellcheckCharAttribute {
  public:
   SpellcheckCharAttribute();
@@ skipping 122 matching lines @@
   // alternative characters supported by our spellchecker. This function also
   // calls SpellcheckWordIterator::OutputChar() to filter out false-positive
   // characters.
   bool Normalize(int input_start,
                  int input_length,
                  base::string16* output_string) const;
 
   // The pointer to the input string from which we are extracting words.
   const base::char16* text_;
 
-  // The length of the original string.
-  int length_;
-
-  // The current position in the original string.
-  int position_;
-
   // The language-specific attributes used for filtering out non-word
   // characters.
   const SpellcheckCharAttribute* attribute_;
 
-  // The ICU break iterator.
-  UBreakIterator* iterator_;
+  // The break iterator.
+  scoped_ptr<base::i18n::BreakIterator> iterator_;
 
   DISALLOW_COPY_AND_ASSIGN(SpellcheckWordIterator);
 };
 
 #endif  // CHROME_RENDERER_SPELLCHECKER_SPELLCHECK_WORDITERATOR_H_