summaryrefslogtreecommitdiffstats
path: root/base/i18n
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-10 21:14:24 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-10 21:14:24 +0000
commitbafaee12825a06890f114a282880e135a8b0b1ae (patch)
tree7de5c22a56597512c23537fa160e59a3ad884df4 /base/i18n
parentcef5e45c554dfa304e5ec3b35998b0158fc709d7 (diff)
downloadchromium_src-bafaee12825a06890f114a282880e135a8b0b1ae.zip
chromium_src-bafaee12825a06890f114a282880e135a8b0b1ae.tar.gz
chromium_src-bafaee12825a06890f114a282880e135a8b0b1ae.tar.bz2
wstring: remove WideToUpper/WideToLower
Also fix two instances of passing a single-char array to a function that expects a string (we must NUL-terminate the array). BUG=23581 Review URL: http://codereview.chromium.org/7000005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84855 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/i18n')
-rw-r--r--base/i18n/case_conversion.cc8
-rw-r--r--base/i18n/case_conversion.h2
-rw-r--r--base/i18n/case_conversion_unittest.cc13
3 files changed, 0 insertions, 23 deletions
diff --git a/base/i18n/case_conversion.cc b/base/i18n/case_conversion.cc
index 2dedade..2762505 100644
--- a/base/i18n/case_conversion.cc
+++ b/base/i18n/case_conversion.cc
@@ -16,19 +16,11 @@ string16 ToLower(const string16& string) {
return string16(unicode_string.getBuffer(), unicode_string.length());
}
-std::wstring WideToLower(const std::wstring& string) {
- return UTF16ToWide(ToLower(WideToUTF16(string)));
-}
-
string16 ToUpper(const string16& string) {
icu::UnicodeString unicode_string(string.c_str(), string.size());
unicode_string.toUpper();
return string16(unicode_string.getBuffer(), unicode_string.length());
}
-std::wstring WideToUpper(const std::wstring& string) {
- return UTF16ToWide(ToUpper(WideToUTF16(string)));
-}
-
} // namespace i18n
} // namespace base
diff --git a/base/i18n/case_conversion.h b/base/i18n/case_conversion.h
index d834ede..cb62da1 100644
--- a/base/i18n/case_conversion.h
+++ b/base/i18n/case_conversion.h
@@ -15,11 +15,9 @@ namespace i18n {
// Returns the lower case equivalent of string. Uses ICU's default locale.
string16 ToLower(const string16& string);
-std::wstring WideToLower(const std::wstring& string);
// Returns the upper case equivalent of string. Uses ICU's default locale.
string16 ToUpper(const string16& string);
-std::wstring WideToUpper(const std::wstring& string);
} // namespace i18n
} // namespace base
diff --git a/base/i18n/case_conversion_unittest.cc b/base/i18n/case_conversion_unittest.cc
index 87a349e..63900ec 100644
--- a/base/i18n/case_conversion_unittest.cc
+++ b/base/i18n/case_conversion_unittest.cc
@@ -21,19 +21,6 @@ TEST(CaseConversionTest, UpperLower) {
EXPECT_EQ(expected_upper, result);
}
-// Test upper and lower case string conversion.
-TEST(CaseConversionTest, WideUpperLower) {
- std::wstring mixed(L"Text with UPPer & lowER casE.");
- const std::wstring expected_lower(L"text with upper & lower case.");
- const std::wstring expected_upper(L"TEXT WITH UPPER & LOWER CASE.");
-
- std::wstring result = base::i18n::WideToLower(mixed);
- EXPECT_EQ(expected_lower, result);
-
- result = base::i18n::WideToUpper(mixed);
- EXPECT_EQ(expected_upper, result);
-}
-
// TODO(jshin): More tests are needed, especially with non-ASCII characters.
} // namespace