Remove wstrings from bookmarks, part 8.

chrome/browser/cocoa/bookmark_editor_controller_unittest.mm

 // 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.
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/string16.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
@@ skipping 43 matching lines @@
   const BookmarkNode* child = default_parent_->GetChild(0);
   EXPECT_EQ(child->GetTitleAsString16(), default_title_);
   EXPECT_EQ(child->GetURL(), GURL(default_name_));
 }
 
 TEST_F(BookmarkEditorControllerTest, EditTitle) {
   [controller_ setDisplayName:@"whamma jamma bamma"];
   [controller_ ok:nil];
   ASSERT_EQ(default_parent_->GetChildCount(), 1);
   const BookmarkNode* child = default_parent_->GetChild(0);
-  EXPECT_EQ(child->GetTitle(), L"whamma jamma bamma");
+  EXPECT_EQ(child->GetTitleAsString16(), ASCIIToUTF16("whamma jamma bamma"));
   EXPECT_EQ(child->GetURL(), GURL(default_name_));
 }
 
 TEST_F(BookmarkEditorControllerTest, EditURL) {
   EXPECT_TRUE([controller_ okButtonEnabled]);
   [controller_ setDisplayURL:@"http://yellow-sneakers.com/"];
   EXPECT_TRUE([controller_ okButtonEnabled]);
   [controller_ ok:nil];
   ASSERT_EQ(default_parent_->GetChildCount(), 1);
   const BookmarkNode* child = default_parent_->GetChild(0);
@@ skipping 306 matching lines @@
 
 TEST_F(BookmarkEditorControllerTreeTest, ChangeNameAndBookmarkGroup) {
   [controller_ setDisplayName:@"NEW NAME"];
   [controller_ selectTestNodeInBrowser:group_c_];
   [controller_ ok:nil];
   UpdateBB3();
   const BookmarkNode* parent = bookmark_bb_3_->GetParent();
   ASSERT_EQ(parent, group_c_);
   int childIndex = parent->IndexOfChild(bookmark_bb_3_);
   ASSERT_EQ(4, childIndex);
-  EXPECT_EQ(bookmark_bb_3_->GetTitle(), L"NEW NAME");
+  EXPECT_EQ(bookmark_bb_3_->GetTitleAsString16(), ASCIIToUTF16("NEW NAME"));
 }
 
 TEST_F(BookmarkEditorControllerTreeTest, AddFolderWithGroupSelected) {
   // Folders are NOT added unless the OK button is pressed.
   [controller_ newFolder:nil];
   [controller_ cancel:nil];
   EXPECT_EQ(5, group_bb_->GetChildCount());
 }
 
 class BookmarkEditorControllerTreeNoNodeTest :
     public BookmarkEditorControllerTreeTest {
  public:
   virtual BookmarkEditorController* CreateController() {
     return [[BookmarkEditorController alloc]
                initWithParentWindow:test_window()
                             profile:browser_helper_.profile()
                              parent:group_bb_
                                node:nil
                       configuration:BookmarkEditor::SHOW_TREE];
   }
 
 };
 
 TEST_F(BookmarkEditorControllerTreeNoNodeTest, NewBookmarkNoNode) {
   [controller_ setDisplayName:@"NEW BOOKMARK"];
   [controller_ setDisplayURL:@"http://NEWURL.com"];
   [controller_ ok:nil];
   const BookmarkNode* new_node = group_bb_->GetChild(5);
   ASSERT_EQ(0, new_node->GetChildCount());
-  EXPECT_EQ(new_node->GetTitle(), L"NEW BOOKMARK");
+  EXPECT_EQ(new_node->GetTitleAsString16(), ASCIIToUTF16("NEW BOOKMARK"));
   EXPECT_EQ(new_node->GetURL(), GURL("http://NEWURL.com"));
 }