4 files changed, 8 insertions, 8 deletions
diff --git a/chrome/browser/bookmarks/bookmark_utils.cc b/chrome/browser/bookmarks/bookmark_utils.cc
index 55b2121..55abf7e 100644
--- a/chrome/browser/bookmarks/bookmark_utils.cc
+++ b/chrome/browser/bookmarks/bookmark_utils.cc
@@ -428,12 +428,12 @@ bool CanPasteFromClipboard(const BookmarkNode* node) {
   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);
   }
 }
 
diff --git a/chrome/browser/bookmarks/bookmark_utils.h b/chrome/browser/bookmarks/bookmark_utils.h
index 0fc7615..5df225d 100644
--- a/chrome/browser/bookmarks/bookmark_utils.h
+++ b/chrome/browser/bookmarks/bookmark_utils.h
@@ -115,7 +115,7 @@ bool CanPasteFromClipboard(const BookmarkNode* node);
 
 // Returns a name for the given URL. Used for drags into bookmark areas when
 // the source doesn't specify a title.
-std::string GetNameForURL(const GURL& url);
+string16 GetNameForURL(const GURL& url);
 
 // Returns a vector containing up to |max_count| of the most recently modified
 // groups. This never returns an empty vector.
diff --git a/chrome/browser/ui/gtk/bookmark_bar_gtk.cc b/chrome/browser/ui/gtk/bookmark_bar_gtk.cc
index a54172c..97faad8 100644
--- a/chrome/browser/ui/gtk/bookmark_bar_gtk.cc
+++ b/chrome/browser/ui/gtk/bookmark_bar_gtk.cc
@@ -1279,8 +1279,8 @@ void BookmarkBarGtk::OnDragReceived(GtkWidget* widget,
       // so that it doesn't look like we can drag onto the bookmark bar.
       if (!url.is_valid())
         break;
-      std::string title = bookmark_utils::GetNameForURL(url);
-      model_->AddURL(dest_node, index, UTF8ToUTF16(title), url);
+      string16 title = bookmark_utils::GetNameForURL(url);
+      model_->AddURL(dest_node, index, title, url);
       dnd_success = TRUE;
       break;
     }
diff --git a/chrome/browser/ui/gtk/bookmark_utils_gtk.cc b/chrome/browser/ui/gtk/bookmark_utils_gtk.cc
index 813482e..2be5242 100644
--- a/chrome/browser/ui/gtk/bookmark_utils_gtk.cc
+++ b/chrome/browser/ui/gtk/bookmark_utils_gtk.cc
@@ -420,8 +420,8 @@ bool CreateNewBookmarksFromURIList(GtkSelectionData* selection_data,
   std::vector<GURL> urls;
   ui::ExtractURIList(selection_data, &urls);
   for (size_t i = 0; i < urls.size(); ++i) {
-    std::string title = GetNameForURL(urls[i]);
-    model->AddURL(parent, idx++, UTF8ToUTF16(title), urls[i]);
+    string16 title = GetNameForURL(urls[i]);
+    model->AddURL(parent, idx++, title, urls[i]);
   }
   return true;
 }