Make bookmark_utils::GetNameForURL return a string16.

chrome/browser/bookmarks/bookmark_utils.cc

 // Copyright (c) 2011 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 "app/l10n_util.h"
 #include "base/basictypes.h"
@@ skipping 410 matching lines @@
   bookmark_utils::CloneBookmarkNode(
       model, bookmark_data.elements, parent, index);
 }
 
 bool CanPasteFromClipboard(const BookmarkNode* node) {
   if (!node)
     return false;
   return BookmarkNodeData::ClipboardContainsBookmarks();
 }
 
-std::string GetNameForURL(const GURL& url) {
+string16 GetNameForURL(const GURL& url) {
   if (url.is_valid()) {
-    return WideToUTF8(net::GetSuggestedFilename(
+    return WideToUTF16(net::GetSuggestedFilename(
         url, std::string(), std::string(), FilePath()).ToWStringHack());
   } else {
-    return l10n_util::GetStringUTF8(IDS_APP_UNTITLED_SHORTCUT_FILE_NAME);
+    return l10n_util::GetStringUTF16(IDS_APP_UNTITLED_SHORTCUT_FILE_NAME);
   }
 }
 
 std::vector<const BookmarkNode*> GetMostRecentlyModifiedGroups(
     BookmarkModel* model,
     size_t max_count) {
   std::vector<const BookmarkNode*> nodes;
   ui::TreeNodeIterator<const BookmarkNode> iterator(model->root_node());
   while (iterator.has_next()) {
     const BookmarkNode* parent = iterator.Next();
@@ skipping 215 matching lines @@
     return true;
 
   for (int i = 0; i < node->GetChildCount(); ++i) {
     if (NodeHasURLs(node->GetChild(i)))
       return true;
   }
   return false;
 }
 
 }  // namespace bookmark_utils