Refactor WordIterator into base::BreakIterator....

chrome/browser/history/in_memory_url_index.cc

 // Copyright (c) 2010 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.
 
 #include "chrome/browser/history/in_memory_url_index.h"
 
 #include <algorithm>
 #include <limits>
 
 #include "app/l10n_util.h"
-#include "base/i18n/word_iterator.h"
+#include "base/i18n/break_iterator.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/history_provider_util.h"
 #include "chrome/browser/history/url_database.h"
 #include "net/base/escape.h"
 #include "net/base/net_util.h"
 #include "unicode/utypes.h"  // for int32_t
 
 using base::Time;
@@ skipping 205 matching lines @@
 
   return history_id_set;
 }
 
 // Utility Functions
 
 // static
 InMemoryURLIndex::String16Set InMemoryURLIndex::WordSetFromString16(
     const string16& uni_string) {
   String16Set words;
-  WordIterator iter(&uni_string, WordIterator::BREAK_WORD);
+  base::BreakIterator iter(&uni_string, base::BreakIterator::BREAK_WORD);
   if (iter.Init()) {
     while (iter.Advance()) {
       if (iter.IsWord())
-        words.insert(iter.GetWord());
+        words.insert(iter.GetString());
     }
   }
   return words;
 }
 
 // static
 InMemoryURLIndex::Char16Set InMemoryURLIndex::CharactersFromString16(
     const string16& uni_word) {
   Char16Set characters;
   for (string16::const_iterator iter = uni_word.begin();
@@ skipping 271 matching lines @@
         if (scored_matches_.size() > 10) {
           scored_matches_.erase(scored_matches_.begin() + 10,
                                 scored_matches_.end());
         }
       }
     }
   }
 }
 
 }  // namespace history