Convert wstrings in bookmarks, part 4.

chrome/browser/views/bookmark_editor_view_unittest.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 "base/message_loop.h"
 #include "base/string_util.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile.h"
@@ skipping 291 matching lines @@
   ASSERT_EQ(2, other_node->GetChildCount());
 
   const BookmarkNode* new_node = other_node->GetChild(0);
 
   EXPECT_EQ(ASCIIToUTF16("new_a"), new_node->GetTitleAsString16());
 }
 
 // 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);
 
   // The url field shouldn't be visible.
   EXPECT_FALSE(URLTFHasParent());
   SetTitleText(L"new_F");
 
   ApplyEdits(editor_tree_model()->GetRoot()->GetChild(0));
 
   // Make sure the folder was created.
   ASSERT_EQ(4, model_->GetBookmarkBarNode()->GetChildCount());
   const BookmarkNode* new_node =
       model_->GetBookmarkBarNode()->GetChild(3);
   EXPECT_EQ(BookmarkNode::FOLDER, new_node->type());
   EXPECT_EQ(ASCIIToUTF16("new_F"), new_node->GetTitleAsString16());
   // The node should have one child.
   ASSERT_EQ(1, new_node->GetChildCount());
   const BookmarkNode* new_child = new_node->GetChild(0);
   // Make sure the child url/title match.
   EXPECT_EQ(BookmarkNode::URL, new_child->type());
   EXPECT_EQ(details.urls[0].second, new_child->GetTitle());
   EXPECT_TRUE(details.urls[0].first == new_child->GetURL());
 }
 
 // Creates a new folder and selects a different folder for the folder to appear
 // 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);
 
   SetTitleText(L"new_F");
 
   // Create the folder in the 'other' folder.
   ApplyEdits(editor_tree_model()->GetRoot()->GetChild(1));
 
   // Make sure the folder we edited is still there.
   ASSERT_EQ(3, model_->other_node()->GetChildCount());
   const BookmarkNode* new_node = model_->other_node()->GetChild(2);
   EXPECT_EQ(BookmarkNode::FOLDER, new_node->type());
   EXPECT_EQ(ASCIIToUTF16("new_F"), new_node->GetTitleAsString16());
   // The node should have one child.
   ASSERT_EQ(1, new_node->GetChildCount());
   const BookmarkNode* new_child = new_node->GetChild(0);
   // Make sure the child url/title match.
   EXPECT_EQ(BookmarkNode::URL, new_child->type());
   EXPECT_EQ(details.urls[0].second, new_child->GetTitle());
   EXPECT_TRUE(details.urls[0].first == new_child->GetURL());
 }