Replace string16 with base::string16.

chrome/browser/bookmarks/bookmark_utils.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_utils.h"
 
 #include <utility>
 
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
@@ skipping 42 matching lines @@
   }
 }
 
 // Comparison function that compares based on date modified of the two nodes.
 bool MoreRecentlyModified(const BookmarkNode* n1, const BookmarkNode* n2) {
   return n1->date_folder_modified() > n2->date_folder_modified();
 }
 
 // Returns true if |text| contains each string in |words|. This is used when
 // searching for bookmarks.
-bool DoesBookmarkTextContainWords(const string16& text,
+bool DoesBookmarkTextContainWords(const base::string16& text,
                                   const std::vector<string16>& words) {
   for (size_t i = 0; i < words.size(); ++i) {
     if (!base::i18n::StringSearchIgnoringCaseAndAccents(
             words[i], text, NULL, NULL)) {
       return false;
     }
   }
   return true;
 }
 
@@ skipping 134 matching lines @@
       }
     }
   }
 }
 
 bool MoreRecentlyAdded(const BookmarkNode* n1, const BookmarkNode* n2) {
   return n1->date_added() > n2->date_added();
 }
 
 void GetBookmarksContainingText(BookmarkModel* model,
-                                const string16& text,
+                                const base::string16& text,
                                 size_t max_count,
                                 const std::string& languages,
                                 std::vector<const BookmarkNode*>* nodes) {
   std::vector<string16> words;
   QueryParser parser;
   parser.ParseQueryWords(base::i18n::ToLower(text), &words);
   if (words.empty())
     return;
 
   ui::TreeNodeIterator<const BookmarkNode> iterator(model->root_node());
@@ skipping 57 matching lines @@
     const BookmarkNode* node = model->GetNodeByID(*iter);
     if (!node)
       continue;
     const BookmarkNode* parent = node->parent();
     model->Remove(parent, parent->GetIndexOf(node));
   }
 }
 
 void AddIfNotBookmarked(BookmarkModel* model,
                         const GURL& url,
-                        const string16& title) {
+                        const base::string16& title) {
   std::vector<const BookmarkNode*> bookmarks;
   model->GetNodesByURL(url, &bookmarks);
   if (!bookmarks.empty())
     return;  // Nothing to do, a bookmark with that url already exists.
 
   content::RecordAction(content::UserMetricsAction("BookmarkAdded"));
   const BookmarkNode* parent = model->GetParentForNewNodes();
   model->AddURL(parent, parent->child_count(), title, url);
 }
 
 void RemoveAllBookmarks(BookmarkModel* model, const GURL& url) {
   std::vector<const BookmarkNode*> bookmarks;
   model->GetNodesByURL(url, &bookmarks);
 
   // Remove all the bookmarks.
   for (size_t i = 0; i < bookmarks.size(); ++i) {
     const BookmarkNode* node = bookmarks[i];
     int index = node->parent()->GetIndexOf(node);
     if (index > -1)
       model->Remove(node->parent(), index);
   }
 }
 
 }  // namespace bookmark_utils