Replace string16 with base::string16.

chrome/browser/bookmarks/bookmark_index.cc

 // Copyright (c) 2012 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/bookmarks/bookmark_index.h"
 
 #include <algorithm>
 #include <iterator>
 #include <list>
 
@@ skipping 58 matching lines @@
 void BookmarkIndex::Remove(const BookmarkNode* node) {
   if (!node->is_url())
     return;
 
   std::vector<string16> terms = ExtractQueryWords(node->GetTitle());
   for (size_t i = 0; i < terms.size(); ++i)
     UnregisterNode(terms[i], node);
 }
 
 void BookmarkIndex::GetBookmarksWithTitlesMatching(
-    const string16& query,
+    const base::string16& query,
     size_t max_count,
     std::vector<BookmarkTitleMatch>* results) {
   std::vector<string16> terms = ExtractQueryWords(query);
   if (terms.empty())
     return;
 
   Matches matches;
   for (size_t i = 0; i < terms.size(); ++i) {
     if (!GetBookmarksWithTitleMatchingTerm(terms[i], i == 0, &matches))
       return;
@@ skipping 66 matching lines @@
   // of QueryParser may filter it out.  For example, the query
   // ["thi"] will match the bookmark titled [Thinking], but since
   // ["thi"] is quoted we don't want to do a prefix match.
   if (parser->DoesQueryMatch(node->GetTitle(), query_nodes,
                              &(title_match.match_positions))) {
     title_match.node = node;
     results->push_back(title_match);
   }
 }
 
-bool BookmarkIndex::GetBookmarksWithTitleMatchingTerm(const string16& term,
+bool BookmarkIndex::GetBookmarksWithTitleMatchingTerm(const base::string16& term,
                                                       bool first_term,
                                                       Matches* matches) {
   Index::const_iterator i = index_.lower_bound(term);
   if (i == index_.end())
     return false;
 
   if (!QueryParser::IsWordLongEnoughForPrefixSearch(term)) {
     // Term is too short for prefix match, compare using exact match.
     if (i->first != term)
       return false;  // No bookmarks with this term.
@@ skipping 61 matching lines @@
     if (!intersection.empty()) {
       result->push_back(Match());
       Match& combined_match = result->back();
       combined_match.terms = match.terms;
       combined_match.terms.push_back(index_i);
       combined_match.nodes.swap(intersection);
     }
   }
 }
 
-std::vector<string16> BookmarkIndex::ExtractQueryWords(const string16& query) {
+std::vector<string16> BookmarkIndex::ExtractQueryWords(const base::string16& query) {
   std::vector<string16> terms;
   if (query.empty())
     return std::vector<string16>();
   QueryParser parser;
   // TODO(brettw): use ICU normalization:
   // http://userguide.icu-project.org/transforms/normalization
   parser.ParseQueryWords(base::i18n::ToLower(query), &terms);
   return terms;
 }
 
-void BookmarkIndex::RegisterNode(const string16& term,
+void BookmarkIndex::RegisterNode(const base::string16& term,
                                  const BookmarkNode* node) {
   index_[term].insert(node);
 }
 
-void BookmarkIndex::UnregisterNode(const string16& term,
+void BookmarkIndex::UnregisterNode(const base::string16& term,
                                    const BookmarkNode* node) {
   Index::iterator i = index_.find(term);
   if (i == index_.end()) {
     // We can get here if the node has the same term more than once. For
     // example, a bookmark with the title 'foo foo' would end up here.
     return;
   }
   i->second.erase(node);
   if (i->second.empty())
     index_.erase(i);
 }