Convert wstrings in bookmarks, part 4.

- convert GetURLAndTitleToBookmark() and GetURLsForOpenTabs()
- convert BookmarkEditor::EditDetails

BUG=23581
TEST=builds and passes tests

Review URL: http://codereview.chromium.org/3176024

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56821 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 17 insertions, 14 deletions

diff --git a/chrome/browser/bookmarks/bookmark_editor.h b/chrome/browser/bookmarks/bookmark_editor.h
index 3a4aa79..63e3b62 100644
--- a/chrome/browser/bookmarks/bookmark_editor.h
+++ b/chrome/browser/bookmarks/bookmark_editor.h
@@ -10,6 +10,7 @@
 #include <utility>
 #include <vector>
 
+#include "base/string16.h"
 #include "gfx/native_widget_types.h"
 
 class BookmarkNode;
@@ -58,7 +59,7 @@ class BookmarkEditor {
 
     // If type == NEW_FOLDER, this is the urls/title pairs to add to the
     // folder.
-    std::vector<std::pair<GURL, std::wstring> > urls;
+    std::vector<std::pair<GURL, string16> > urls;
   };
 
   // Shows the bookmark editor. The bookmark editor allows editing an
diff --git a/chrome/browser/bookmarks/bookmark_model_unittest.cc b/chrome/browser/bookmarks/bookmark_model_unittest.cc
index f588068..7b8727a 100644
--- a/chrome/browser/bookmarks/bookmark_model_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_model_unittest.cc
@@ -964,10 +964,10 @@ TEST_F(BookmarkModelTest, Sort) {
   PopulateBookmarkNode(&bbn, &model, parent);
 
   BookmarkNode* child1 = AsMutable(parent->GetChild(1));
-  child1->SetTitle(L"a");
+  child1->SetTitle(ASCIIToUTF16("a"));
   delete child1->Remove(0);
   BookmarkNode* child3 = AsMutable(parent->GetChild(3));
-  child3->SetTitle(L"C");
+  child3->SetTitle(ASCIIToUTF16("C"));
   delete child3->Remove(0);
 
   ClearCounts();
diff --git a/chrome/browser/bookmarks/bookmark_utils.cc b/chrome/browser/bookmarks/bookmark_utils.cc
index 2b04c2d..af8d6ac 100644
--- a/chrome/browser/bookmarks/bookmark_utils.cc
+++ b/chrome/browser/bookmarks/bookmark_utils.cc
@@ -180,7 +180,7 @@ bool MoreRecentlyModified(const BookmarkNode* n1, const BookmarkNode* n2) {
 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;
@@ -616,15 +616,15 @@ void RegisterUserPrefs(PrefService* prefs) {
 
 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);
diff --git a/chrome/browser/bookmarks/bookmark_utils.h b/chrome/browser/bookmarks/bookmark_utils.h
index 3f03710..217a25f 100644
--- a/chrome/browser/bookmarks/bookmark_utils.h
+++ b/chrome/browser/bookmarks/bookmark_utils.h
@@ -190,12 +190,12 @@ void RegisterUserPrefs(PrefService* prefs);
 // Fills in the URL and title for a bookmark of |tab_contents|.
 void GetURLAndTitleToBookmark(TabContents* tab_contents,
                               GURL* url,
-                              std::wstring* title);
+                              string16* title);
 
 // Returns, by reference in |urls|, the url and title pairs for each open
 // tab in browser.
 void GetURLsForOpenTabs(Browser* browser,
-                        std::vector<std::pair<GURL, std::wstring> >* urls);
+                        std::vector<std::pair<GURL, string16> >* urls);
 
 // Returns the parent for newly created folders/bookmarks. If |selection| has
 // one element and it is a folder, |selection[0]| is returned, otherwise
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index 77fb280..63f0338 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -1492,11 +1492,11 @@ void Browser::BookmarkCurrentPage() {
     return;  // Ignore requests until bookmarks are loaded.
 
   GURL url;
-  std::wstring title;
+  string16 title;
   bookmark_utils::GetURLAndTitleToBookmark(GetSelectedTabContents(), &url,
                                            &title);
   bool was_bookmarked = model->IsBookmarked(url);
-  model->SetURLStarred(url, WideToUTF16Hack(title), true);
+  model->SetURLStarred(url, title, true);
   // Make sure the model actually added a bookmark before showing the star. A
   // bookmark isn't created if the url is invalid.
   if (window_->IsActive() && model->IsBookmarked(url)) {
diff --git a/chrome/browser/views/bookmark_editor_view_unittest.cc b/chrome/browser/views/bookmark_editor_view_unittest.cc
index 6040c6e..49682b3 100644
--- a/chrome/browser/views/bookmark_editor_view_unittest.cc
+++ b/chrome/browser/views/bookmark_editor_view_unittest.cc
@@ -309,7 +309,8 @@ TEST_F(BookmarkEditorViewTest, ChangeTitleNoTree) {
 // Creates a new folder.
 TEST_F(BookmarkEditorViewTest, NewFolder) {
   BookmarkEditor::EditDetails details;
-  details.urls.push_back(std::make_pair(GURL(base_path() + "x"), L"z"));
+  details.urls.push_back(std::make_pair(GURL(base_path() + "x"),
+                                        ASCIIToUTF16("z")));
   details.type = BookmarkEditor::EditDetails::NEW_FOLDER;
   CreateEditor(profile_.get(), model_->GetBookmarkBarNode(),
                details, BookmarkEditorView::SHOW_TREE);
@@ -339,7 +340,8 @@ TEST_F(BookmarkEditorViewTest, NewFolder) {
 // in then the editor is initially created showing.
 TEST_F(BookmarkEditorViewTest, MoveFolder) {
   BookmarkEditor::EditDetails details;
-  details.urls.push_back(std::make_pair(GURL(base_path() + "x"), L"z"));
+  details.urls.push_back(std::make_pair(GURL(base_path() + "x"),
+                                        ASCIIToUTF16("z")));
   details.type = BookmarkEditor::EditDetails::NEW_FOLDER;
   CreateEditor(profile_.get(), model_->GetBookmarkBarNode(),
                details, BookmarkEditorView::SHOW_TREE);