| Index: base/strings/utf_string_conversions_unittest.cc | 
| diff --git a/base/strings/utf_string_conversions_unittest.cc b/base/strings/utf_string_conversions_unittest.cc | 
| index a7b12ffe0e01d205cc54ddc55d483d7c2fb1f2b9..97d8cbb668c0f5b1363c29f2862ef40e7d65062b 100644 | 
| --- a/base/strings/utf_string_conversions_unittest.cc | 
| +++ b/base/strings/utf_string_conversions_unittest.cc | 
| @@ -185,11 +185,11 @@ TEST(UTFStringConversionsTest, ConvertUTF32ToUTF8) { | 
| #endif  // defined(WCHAR_T_IS_UTF32) | 
|  | 
| TEST(UTFStringConversionsTest, ConvertMultiString) { | 
| -  static wchar_t wmulti[] = { | 
| -    L'f', L'o', L'o', L'\0', | 
| -    L'b', L'a', L'r', L'\0', | 
| -    L'b', L'a', L'z', L'\0', | 
| -    L'\0' | 
| +  static char16 multi16[] = { | 
| +    'f', 'o', 'o', '\0', | 
| +    'b', 'a', 'r', '\0', | 
| +    'b', 'a', 'z', '\0', | 
| +    '\0' | 
| }; | 
| static char multi[] = { | 
| 'f', 'o', 'o', '\0', | 
| @@ -197,13 +197,14 @@ TEST(UTFStringConversionsTest, ConvertMultiString) { | 
| 'b', 'a', 'z', '\0', | 
| '\0' | 
| }; | 
| -  std::wstring wmultistring; | 
| -  memcpy(WriteInto(&wmultistring, arraysize(wmulti)), wmulti, sizeof(wmulti)); | 
| -  EXPECT_EQ(arraysize(wmulti) - 1, wmultistring.length()); | 
| +  string16 multistring16; | 
| +  memcpy(WriteInto(&multistring16, arraysize(multi16)), multi16, | 
| +                   sizeof(multi16)); | 
| +  EXPECT_EQ(arraysize(multi16) - 1, multistring16.length()); | 
| std::string expected; | 
| memcpy(WriteInto(&expected, arraysize(multi)), multi, sizeof(multi)); | 
| EXPECT_EQ(arraysize(multi) - 1, expected.length()); | 
| -  const std::string& converted = WideToUTF8(wmultistring); | 
| +  const std::string& converted = UTF16ToUTF8(multistring16); | 
| EXPECT_EQ(arraysize(multi) - 1, converted.length()); | 
| EXPECT_EQ(expected, converted); | 
| } | 
|  |