Remove wstrings from bookmarks, part 8.

chrome/browser/cocoa/bookmark_bar_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 "app/theme_provider.h"
 #include "base/basictypes.h"
 #include "base/scoped_nsobject.h"
 #include "base/string16.h"
@@ skipping 996 matching lines @@
   }
 }
 
 TEST_F(BookmarkBarControllerTest, DropBookmarks) {
   const char* urls[] = {
     "http://qwantz.com",
     "http://xkcd.com",
     "javascript:alert('lolwut')",
     "file://localhost/tmp/local-file.txt"  // As if dragged from the desktop.
   };
-  std::wstring titles[] = {
-    std::wstring(L"Philosophoraptor"),
-    std::wstring(L"Can't draw"),
-    std::wstring(L"Inspiration"),
-    std::wstring(L"Frum stuf")
+  const char* titles[] = {
+    "Philosophoraptor",
+    "Can't draw",
+    "Inspiration",
+    "Frum stuf"
   };
   EXPECT_EQ(arraysize(urls), arraysize(titles));
 
   NSMutableArray* nsurls = [NSMutableArray array];
   NSMutableArray* nstitles = [NSMutableArray array];
   for (size_t i = 0; i < arraysize(urls); ++i) {
     [nsurls addObject:base::SysUTF8ToNSString(urls[i])];
-    [nstitles addObject:base::SysWideToNSString(titles[i])];
+    [nstitles addObject:base::SysUTF8ToNSString(titles[i])];
   }
 
   BookmarkModel* model = helper_.profile()->GetBookmarkModel();
   const BookmarkNode* parent = model->GetBookmarkBarNode();
   [bar_ addURLs:nsurls withTitles:nstitles at:NSZeroPoint];
   EXPECT_EQ(4, parent->GetChildCount());
   for (int i = 0; i < parent->GetChildCount(); ++i) {
     GURL gurl = parent->GetChild(i)->GetURL();
     if (gurl.scheme() == "http" ||
         gurl.scheme() == "javascript") {
       EXPECT_EQ(parent->GetChild(i)->GetURL(), GURL(urls[i]));
     } else {
       // Be flexible if the scheme needed to be added.
       std::string gurl_string = gurl.spec();
       std::string my_string = parent->GetChild(i)->GetURL().spec();
       EXPECT_NE(gurl_string.find(my_string), std::string::npos);
     }
-    EXPECT_EQ(parent->GetChild(i)->GetTitle(), titles[i]);
+    EXPECT_EQ(parent->GetChild(i)->GetTitleAsString16(),
+              ASCIIToUTF16(titles[i]));
   }
 }
 
 TEST_F(BookmarkBarControllerTest, TestButtonOrBar) {
   BookmarkModel* model = helper_.profile()->GetBookmarkModel();
   GURL gurl1("http://www.google.com");
   string16 title1(ASCIIToUTF16("x"));
   model->SetURLStarred(gurl1, title1, true);
 
   GURL gurl2("http://www.google.com/gurl_power");
@@ skipping 101 matching lines @@
   const BookmarkNode* folder = model->AddGroup(model->GetBookmarkBarNode(),
                                                0,
                                                ASCIIToUTF16("awesome group"));
   DCHECK(folder);
   model->AddURL(folder, 0, ASCIIToUTF16("already"),
                 GURL("http://www.google.com"));
   EXPECT_EQ(arraysize(titles) + 1, [[bar_ buttons] count]);
   EXPECT_EQ(1, folder->GetChildCount());
   x = NSMidX([[[bar_ buttons] objectAtIndex:0] frame]);
   x += [[bar_ view] frame].origin.x;
-  std::wstring title = [[[bar_ buttons] objectAtIndex:2]
-                         bookmarkNode]->GetTitle();
+  string16 title =
+      [[[bar_ buttons] objectAtIndex:2] bookmarkNode]->GetTitleAsString16();
   [bar_ dragButton:[[bar_ buttons] objectAtIndex:2]
                 to:NSMakePoint(x, 0)
               copy:NO];
   // Gone from the bar
   EXPECT_EQ(arraysize(titles), [[bar_ buttons] count]);
   // In the folder
   EXPECT_EQ(2, folder->GetChildCount());
   // At the end
-  EXPECT_EQ(title, folder->GetChild(1)->GetTitle());
+  EXPECT_EQ(title, folder->GetChild(1)->GetTitleAsString16());
 }
 
 TEST_F(BookmarkBarControllerTest, TestCopyButton) {
   BookmarkModel* model = helper_.profile()->GetBookmarkModel();
 
   GURL gurls[] = { GURL("http://www.google.com/a"),
                    GURL("http://www.google.com/b"),
                    GURL("http://www.google.com/c") };
   string16 titles[] = { ASCIIToUTF16("a"),
                         ASCIIToUTF16("b"),
@@ skipping 750 matching lines @@
                               "2f3b ] O3f:[ O3f1b O3f2f ] 3b 4b ");
   actual = model_test_utils::ModelStringFromNode(root);
   EXPECT_EQ(expected, actual);
   oldChildCount = newChildCount;
 
   // Now do it over a folder button.
   targetButton = [bar_ buttonWithTitleEqualTo:@"2f"];
   ASSERT_TRUE(targetButton);
   NSPoint targetPoint = [targetButton center];
   newNode = other->GetChild(2);  // Should be O4f.
-  EXPECT_EQ(newNode->GetTitle(), L"O4f");
+  EXPECT_EQ(newNode->GetTitleAsString16(), ASCIIToUTF16("O4f"));
   [bar_ setDragDataNode:newNode];
   [dragInfo setDropLocation:targetPoint];
   [bar_ dragBookmarkData:(id<NSDraggingInfo>)dragInfo.get()];
 
   newChildCount = root->GetChildCount();
   EXPECT_EQ(oldChildCount, newChildCount);
   // Verify the model.
   const std::wstring expected1(L"1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b 2f2f3b ] "
                                "2f3b O4f:[ O4f1b O4f2f ] ] O3f:[ O3f1b O3f2f ] "
                                "3b 4b ");
@@ skipping 110 matching lines @@
                        bookmark_button::kBookmarkPulseFlagKey,
                        nil];
   [[NSNotificationCenter defaultCenter]
         postNotificationName:bookmark_button::kPulseBookmarkButtonNotification
                       object:nil
                     userInfo:dict];
   EXPECT_FALSE([button isContinuousPulsing]);
 }
 
 }  // namespace