Remove wstring from l10n_util. Part 8, the last part....

chrome/browser/bookmarks/bookmark_model.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_model.h"
 
 #include "app/l10n_util.h"
 #include "app/l10n_util_collator.h"
 #include "base/callback.h"
 #include "base/scoped_vector.h"
@@ skipping 84 matching lines @@
                                                    bool> {
  public:
   explicit SortComparator(icu::Collator* collator) : collator_(collator) { }
 
   // Returns true if lhs preceeds rhs.
   bool operator() (const BookmarkNode* n1, const BookmarkNode* n2) {
     if (n1->type() == n2->type()) {
       // Types are the same, compare the names.
       if (!collator_)
         return n1->GetTitle() < n2->GetTitle();
-      return l10n_util::CompareStringWithCollator(collator_,
-          UTF16ToWideHack(n1->GetTitle()), UTF16ToWideHack(n2->GetTitle())) ==
-          UCOL_LESS;
+      return l10n_util::CompareString16WithCollator(
+          collator_, n1->GetTitle(), n2->GetTitle()) == UCOL_LESS;
     }
     // Types differ, sort such that folders come first.
     return n1->is_folder();
   }
 
  private:
   icu::Collator* collator_;
 };
 
 }  // namespace
@@ skipping 703 matching lines @@
 void BookmarkModel::SetFileChanged() {
   file_changed_ = true;
 }
 
 BookmarkLoadDetails* BookmarkModel::CreateLoadDetails() {
   BookmarkNode* bb_node = CreateBookmarkNode();
   BookmarkNode* other_folder_node = CreateOtherBookmarksNode();
   return new BookmarkLoadDetails(
       bb_node, other_folder_node, new BookmarkIndex(profile()), next_node_id_);
 }