Convert infobar APIs to UTF-16.

chrome/browser/cocoa/infobar_controller_unittest.mm

 // Copyright (c) 2009 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/scoped_nsobject.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #import "chrome/browser/cocoa/cocoa_test_helper.h"
@@ skipping 116 matching lines @@
 // Tests
 
 TEST_VIEW(AlertInfoBarControllerTest, [controller_ view]);
 
 TEST_F(AlertInfoBarControllerTest, ShowAndDismiss) {
   // Make sure someone looked at the message and icon.
   EXPECT_TRUE(delegate_.message_text_accessed);
   EXPECT_TRUE(delegate_.icon_accessed);
 
   // Check to make sure the infobar message was set properly.
-  EXPECT_EQ(std::wstring(kMockAlertInfoBarMessage),
-            base::SysNSStringToWide([controller_.get() labelString]));
+  EXPECT_EQ(kMockAlertInfoBarMessage,
+            base::SysNSStringToUTF8([controller_.get() labelString]));
 
   // Check that dismissing the infobar calls InfoBarClosed() on the delegate.
   [controller_ dismiss:nil];
   EXPECT_TRUE(delegate_.closed);
 }
 
 TEST_F(AlertInfoBarControllerTest, DeallocController) {
   // Test that dealloc'ing the controller does not send an
   // InfoBarClosed() message to the delegate.
   controller_.reset(nil);
@@ skipping 48 matching lines @@
 
 TEST_VIEW(ConfirmInfoBarControllerTest, [controller_ view]);
 
 TEST_F(ConfirmInfoBarControllerTest, ShowAndDismiss) {
   // Make sure someone looked at the message, link, and icon.
   EXPECT_TRUE(delegate_.message_text_accessed);
   EXPECT_TRUE(delegate_.link_text_accessed);
   EXPECT_TRUE(delegate_.icon_accessed);
 
   // Check to make sure the infobar message was set properly.
-  EXPECT_EQ(std::wstring(kMockConfirmInfoBarMessage),
-            base::SysNSStringToWide([controller_.get() labelString]));
+  EXPECT_EQ(kMockConfirmInfoBarMessage,
+            base::SysNSStringToUTF8([controller_.get() labelString]));
 
   // Check that dismissing the infobar calls InfoBarClosed() on the delegate.
   [controller_ dismiss:nil];
   EXPECT_FALSE(delegate_.ok_clicked);
   EXPECT_FALSE(delegate_.cancel_clicked);
   EXPECT_FALSE(delegate_.link_clicked);
   EXPECT_TRUE(delegate_.closed);
 }
 
 TEST_F(ConfirmInfoBarControllerTest, ShowAndClickOK) {
@@ skipping 56 matching lines @@
   // Check that clicking on the link calls LinkClicked() on the
   // delegate.  It should not close the infobar.
   [controller_ linkClicked];
   EXPECT_FALSE(delegate_.ok_clicked);
   EXPECT_FALSE(delegate_.cancel_clicked);
   EXPECT_TRUE(delegate_.link_clicked);
   EXPECT_FALSE(delegate_.closed);
 }
 
 }  // namespace