Remove wstring from l10n_util. Part 1....

chrome/browser/chromeos/input_method/input_method_util_unittest.cc

 // 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/chromeos/input_method/input_method_util.h"
 
 #include <string>
 
 #include "app/l10n_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 194 matching lines @@
   EXPECT_EQ("ro", GetKeyboardOverlayId("xkb:ro::rum"));
   EXPECT_EQ("sv", GetKeyboardOverlayId("xkb:se::swe"));
   EXPECT_EQ("sk", GetKeyboardOverlayId("xkb:sk::slo"));
   EXPECT_EQ("sl", GetKeyboardOverlayId("xkb:si::slv"));
   EXPECT_EQ("sr", GetKeyboardOverlayId("xkb:rs::srp"));
   EXPECT_EQ("tr", GetKeyboardOverlayId("xkb:tr::tur"));
   EXPECT_EQ("uk", GetKeyboardOverlayId("xkb:ua::ukr"));
 }
 
 TEST(InputMethodUtilTest, GetLanguageDisplayNameFromCode) {
-  EXPECT_EQ(L"Finnish", GetLanguageDisplayNameFromCode("fi"));
+  EXPECT_EQ(UTF8ToUTF16("Finnish"), GetLanguageDisplayNameFromCode("fi"));
 }
 
 TEST(InputMethodUtilTest, GetLanguageNativeDisplayNameFromCode) {
-  EXPECT_EQ(L"suomi", GetLanguageNativeDisplayNameFromCode("fi"));
+  EXPECT_EQ(UTF8ToUTF16("suomi"), GetLanguageNativeDisplayNameFromCode("fi"));
 }
 
 TEST(InputMethodUtilTest, SortLanguageCodesByNames) {
   std::vector<std::string> language_codes;
   // Check if this function can handle an empty list.
   SortLanguageCodesByNames(&language_codes);
 
   language_codes.push_back("ja");
   language_codes.push_back("fr");
   // For "t", see the comment in NormalizeLanguageCode test.
@@ skipping 80 matching lines @@
   EXPECT_EQ("xkb:fr:fra", result[0]);
 
   EXPECT_FALSE(GetInputMethodIdsFromLanguageCodeInternal(
       language_code_to_ids_map, "invalid_lang", kAllInputMethods, &result));
   EXPECT_FALSE(GetInputMethodIdsFromLanguageCodeInternal(
       language_code_to_ids_map, "invalid_lang", kKeyboardLayoutsOnly, &result));
 }
 
 }  // namespace input_method
 }  // namespace chromeos