Remove wstring from l10n_util. Part 1....

app/l10n_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 "build/build_config.h"
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 #include <cstdlib>
 #endif
 
@@ skipping 14 matching lines @@
 #include "base/win/windows_version.h"
 #endif
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 #include "unicode/locid.h"
 
 namespace {
 
 class StringWrapper {
  public:
-  explicit StringWrapper(const std::wstring& string) : string_(string) {}
-  const std::wstring& string() const { return string_; }
+  explicit StringWrapper(const string16& string) : string_(string) {}
+  const string16& string() const { return string_; }
 
  private:
-  std::wstring string_;
+  string16 string_;
 
   DISALLOW_COPY_AND_ASSIGN(StringWrapper);
 };
 
 }  // namespace
 
 class L10nUtilTest : public PlatformTest {
 };
 
 #if defined(OS_WIN)
 // TODO(beng): disabled until app strings move to app.
 TEST_F(L10nUtilTest, DISABLED_GetString) {
-  std::wstring s = l10n_util::GetString(IDS_SIMPLE);
-  EXPECT_EQ(std::wstring(L"Hello World!"), s);
+  std::string s = l10n_util::GetStringUTF8(IDS_SIMPLE);
+  EXPECT_EQ(std::string("Hello World!"), s);
 
-  s = l10n_util::GetStringF(IDS_PLACEHOLDERS, L"chrome", L"10");
-  EXPECT_EQ(std::wstring(L"Hello, chrome. Your number is 10."), s);
+  s = l10n_util::GetStringFUTF8(IDS_PLACEHOLDERS,
+                                UTF8ToUTF16("chrome"),
+                                UTF8ToUTF16("10"));
+  EXPECT_EQ(std::string("Hello, chrome. Your number is 10."), s);
 
-  s = l10n_util::GetStringF(IDS_PLACEHOLDERS_2, 20);
-  EXPECT_EQ(std::wstring(L"You owe me $20."), s);
+  string16 s16 = l10n_util::GetStringFUTF16(IDS_PLACEHOLDERS_2, 20);

[Evan Martin, 2010/12/24 01:00:42]

Can't this use a std::string as well?

[Avi (use Gerrit), 2010/12/28 15:02:55]

No, this is a test for the int helper.

+  EXPECT_EQ(UTF8ToUTF16("You owe me $20."), s16);
 }
 #endif  // defined(OS_WIN)
 
 TEST_F(L10nUtilTest, TruncateString) {
   string16 string = ASCIIToUTF16("foooooey    bxxxar baz");
 
   // Make sure it doesn't modify the string if length > string length.
   EXPECT_EQ(string, l10n_util::TruncateString(string, 100));
 
   // Test no characters.
@@ skipping 208 matching lines @@
   // Clean up.
   PathService::Override(app::DIR_LOCALES, orig_locale_dir);
   file_util::Delete(new_locale_dir, true);
   UErrorCode error_code = U_ZERO_ERROR;
   icu::Locale::setDefault(locale, error_code);
 }
 #endif  // !defined(OS_MACOSX)
 
 TEST_F(L10nUtilTest, SortStringsUsingFunction) {
   std::vector<StringWrapper*> strings;
-  strings.push_back(new StringWrapper(L"C"));
-  strings.push_back(new StringWrapper(L"d"));
-  strings.push_back(new StringWrapper(L"b"));
-  strings.push_back(new StringWrapper(L"a"));
-  l10n_util::SortStringsUsingMethod(L"en-US", &strings, &StringWrapper::string);
-  ASSERT_TRUE(L"a" == strings[0]->string());
-  ASSERT_TRUE(L"b" == strings[1]->string());
-  ASSERT_TRUE(L"C" == strings[2]->string());
-  ASSERT_TRUE(L"d" == strings[3]->string());
+  strings.push_back(new StringWrapper(UTF8ToUTF16("C")));
+  strings.push_back(new StringWrapper(UTF8ToUTF16("d")));
+  strings.push_back(new StringWrapper(UTF8ToUTF16("b")));
+  strings.push_back(new StringWrapper(UTF8ToUTF16("a")));
+  l10n_util::SortStringsUsingMethod("en-US",
+                                    &strings,
+                                    &StringWrapper::string);
+  ASSERT_TRUE(UTF8ToUTF16("a") == strings[0]->string());
+  ASSERT_TRUE(UTF8ToUTF16("b") == strings[1]->string());
+  ASSERT_TRUE(UTF8ToUTF16("C") == strings[2]->string());
+  ASSERT_TRUE(UTF8ToUTF16("d") == strings[3]->string());
   STLDeleteElements(&strings);
 }
 
 // Test upper and lower case string conversion.
 TEST_F(L10nUtilTest, UpperLower) {
   string16 mixed(ASCIIToUTF16("Text with UPPer & lowER casE."));
   const string16 expected_lower(ASCIIToUTF16("text with upper & lower case."));
   const string16 expected_upper(ASCIIToUTF16("TEXT WITH UPPER & LOWER CASE."));
 
   string16 result = l10n_util::ToLower(mixed);
@@ skipping 77 matching lines @@
   EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("Latin"));
   EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("German"));
   EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("pt--BR"));
   EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("sl-macedonia"));
   EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("@"));
   EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("en-US@"));
   EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("en-US@x"));
   EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("en-US@x="));
   EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("en-US@=y"));
 }