Remove wstrings from bookmarks, part 7.

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 687 matching lines @@
   entry.type = history::StarredEntry::OTHER;
   return CreateRootNodeFromStarredEntry(entry);
 }
 
 BookmarkNode* BookmarkModel::CreateRootNodeFromStarredEntry(
     const history::StarredEntry& entry) {
   DCHECK(entry.type == history::StarredEntry::BOOKMARK_BAR ||
          entry.type == history::StarredEntry::OTHER);
   BookmarkNode* node = new BookmarkNode(generate_next_node_id(), GURL());
   node->Reset(entry);
-  if (entry.type == history::StarredEntry::BOOKMARK_BAR)
-    node->SetTitle(l10n_util::GetString(IDS_BOOMARK_BAR_FOLDER_NAME));
-  else
-    node->SetTitle(l10n_util::GetString(IDS_BOOMARK_BAR_OTHER_FOLDER_NAME));
+  if (entry.type == history::StarredEntry::BOOKMARK_BAR) {
+    node->SetTitle(l10n_util::GetStringUTF16(IDS_BOOMARK_BAR_FOLDER_NAME));
+  } else {
+    node->SetTitle(
+        l10n_util::GetStringUTF16(IDS_BOOMARK_BAR_OTHER_FOLDER_NAME));
+  }
   return node;
 }
 
 void BookmarkModel::OnFavIconDataAvailable(
     FaviconService::Handle handle,
     bool know_favicon,
     scoped_refptr<RefCountedMemory> data,
     bool expired,
     GURL icon_url) {
   SkBitmap fav_icon;
@@ skipping 80 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_);
 }