Remove wstrings in bookmarks, part 5.

chrome/browser/gtk/bookmark_bar_gtk_unittest.cc

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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 "chrome/browser/gtk/bookmark_bar_gtk.h"
 
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/gtk/tabstrip_origin_provider.h"
 #include "base/task.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "chrome/test/testing_profile.h"
 
 // Dummy implementation that's good enough for the tests; we don't test
 // rendering here so all we need is a non-NULL object.
@@ skipping 35 matching lines @@
   // There are no bookmarks in the model by default. Expect that the
   // |instructions_label| is shown.
   EXPECT_TRUE(bookmark_bar_->show_instructions_);
 }
 
 TEST_F(BookmarkBarGtkUnittest, HidesHelpMessageWithBookmark) {
   BookmarkModel* model = profile_->GetBookmarkModel();
 
   const BookmarkNode* parent = model->GetBookmarkBarNode();
   model->AddURL(parent, parent->GetChildCount(),
-                L"title", GURL("http://one.com"));
+                ASCIIToUTF16("title"), GURL("http://one.com"));
 
   bookmark_bar_->Loaded(model);
   EXPECT_FALSE(bookmark_bar_->show_instructions_);
 }
 
 TEST_F(BookmarkBarGtkUnittest, BuildsButtons) {
   BookmarkModel* model = profile_->GetBookmarkModel();
 
   const BookmarkNode* parent = model->GetBookmarkBarNode();
   model->AddURL(parent, parent->GetChildCount(),
-                L"title", GURL("http://one.com"));
+                ASCIIToUTF16("title"), GURL("http://one.com"));
   model->AddURL(parent, parent->GetChildCount(),
-                L"other", GURL("http://two.com"));
+                ASCIIToUTF16("other"), GURL("http://two.com"));
 
   bookmark_bar_->Loaded(model);
 
   // We should expect two children to the bookmark bar's toolbar.
   GList* children = gtk_container_get_children(
       GTK_CONTAINER(bookmark_bar_->bookmark_toolbar_.get()));
   EXPECT_EQ(2U, g_list_length(children));
   g_list_free(children);
 }