Refactor WordIterator into base::BreakIterator....

chrome/browser/autocomplete/history_quick_provider.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/autocomplete/history_quick_provider.h"
 
 #include "base/basictypes.h"
-#include "base/i18n/word_iterator.h"
+#include "base/i18n/break_iterator.h"
 #include "base/string_util.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/history/in_memory_url_index.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/plugin_service.h"
@@ skipping 141 matching lines @@
     history::InMemoryURLIndex* index) {
   DCHECK(index);
   index_for_testing_.reset(index);
 }
 
 // Utility Functions
 
 history::InMemoryURLIndex::String16Vector
     HistoryQuickProvider::WordVectorFromString16(const string16& uni_string) {
   history::InMemoryURLIndex::String16Vector 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.push_back(iter.GetWord());
+        words.push_back(iter.GetString());
     }
   }
   return words;
 }
 
 // static
 int HistoryQuickProvider::CalculateRelevance(int raw_score,
                                              AutocompleteInput::Type input_type,
                                              MatchType match_type,
                                              size_t match_number) {
   switch (match_type) {
     case INLINE_AUTOCOMPLETE:
       return 1400;
 
     case WHAT_YOU_TYPED:
       return 1200;
 
     default:
       return 900 + static_cast<int>(match_number);
   }
 }