Convert wstrings in bookmarks, part 4.

chrome/browser/bookmarks/bookmark_utils.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/bookmarks/bookmark_utils.h"
 
 #include "app/drag_drop_types.h"
 #include "app/l10n_util.h"
 #include "app/tree_node_iterator.h"
 #include "base/basictypes.h"
@@ skipping 162 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_group_modified() > n2->date_group_modified();
 }
 
 // Returns true if |text| contains each string in |words|. This is used when
 // searching for bookmarks.
 bool DoesBookmarkTextContainWords(const string16& text,
                                   const std::vector<string16>& words) {
   for (size_t i = 0; i < words.size(); ++i) {
-    if (text.find(words[i]) == std::wstring::npos)
+    if (text.find(words[i]) == string16::npos)
       return false;
   }
   return true;
 }
 
 // Returns true if |node|s title or url contains the strings in |words|.
 // |languages| argument is user's accept-language setting to decode IDN.
 bool DoesBookmarkContainWords(const BookmarkNode* node,
                               const std::vector<string16>& words,
                               const std::wstring& languages) {
@@ skipping 415 matching lines @@
       source,
       NotificationService::NoDetails());
 }
 
 void RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterBooleanPref(prefs::kShowBookmarkBar, false);
 }
 
 void GetURLAndTitleToBookmark(TabContents* tab_contents,
                               GURL* url,
-                              std::wstring* title) {
+                              string16* title) {
   *url = tab_contents->GetURL();
-  *title = UTF16ToWideHack(tab_contents->GetTitle());
+  *title = tab_contents->GetTitle();
 }
 
 void GetURLsForOpenTabs(Browser* browser,
-    std::vector<std::pair<GURL, std::wstring> >* urls) {
+    std::vector<std::pair<GURL, string16> >* urls) {
   for (int i = 0; i < browser->tab_count(); ++i) {
-    std::pair<GURL, std::wstring> entry;
+    std::pair<GURL, string16> entry;
     GetURLAndTitleToBookmark(browser->GetTabContentsAt(i), &(entry.first),
                              &(entry.second));
     urls->push_back(entry);
   }
 }
 
 const BookmarkNode* GetParentForNewNodes(
     const BookmarkNode* parent,
     const std::vector<const BookmarkNode*>& selection,
     int* index) {
@@ skipping 12 matching lines @@
       }
     } else {
       *index = real_parent->GetChildCount();
     }
   }
 
   return real_parent;
 }
 
 }  // namespace bookmark_utils