diff options
| author | thestig <thestig@chromium.org> | 2014-12-08 13:00:22 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-08 21:00:46 +0000 |
| commit | 93570e26b8f852041f5729fe40f53361ee1e6b49 (patch) | |
| tree | 7ef867a46c114c6ff102b1eef558eda34809ac3e /base/strings | |
| parent | daaa100e8cceaa13d562ece174fd203b2aca8a7e (diff) | |
| download | chromium_src-93570e26b8f852041f5729fe40f53361ee1e6b49.zip chromium_src-93570e26b8f852041f5729fe40f53361ee1e6b49.tar.gz chromium_src-93570e26b8f852041f5729fe40f53361ee1e6b49.tar.bz2 | |
Cleanup: Get rid of base::ASCIIToWide().
BUG=23581
Review URL: https://codereview.chromium.org/768973003
Cr-Commit-Position: refs/heads/master@{#307333}
Diffstat (limited to 'base/strings')
| -rw-r--r-- | base/strings/string_util_unittest.cc | 8 | ||||
| -rw-r--r-- | base/strings/utf_string_conversions.cc | 5 | ||||
| -rw-r--r-- | base/strings/utf_string_conversions.h | 5 |
3 files changed, 6 insertions, 12 deletions
diff --git a/base/strings/string_util_unittest.cc b/base/strings/string_util_unittest.cc index f29baac..923116d 100644 --- a/base/strings/string_util_unittest.cc +++ b/base/strings/string_util_unittest.cc @@ -494,10 +494,10 @@ TEST(StringUtilTest, ConvertASCII) { const char chars_with_nul[] = "test\0string"; const int length_with_nul = arraysize(chars_with_nul) - 1; std::string string_with_nul(chars_with_nul, length_with_nul); - std::wstring wide_with_nul = ASCIIToWide(string_with_nul); - EXPECT_EQ(static_cast<std::wstring::size_type>(length_with_nul), - wide_with_nul.length()); - std::string narrow_with_nul = UTF16ToASCII(WideToUTF16(wide_with_nul)); + base::string16 string16_with_nul = ASCIIToUTF16(string_with_nul); + EXPECT_EQ(static_cast<base::string16::size_type>(length_with_nul), + string16_with_nul.length()); + std::string narrow_with_nul = UTF16ToASCII(string16_with_nul); EXPECT_EQ(static_cast<std::string::size_type>(length_with_nul), narrow_with_nul.length()); EXPECT_EQ(0, string_with_nul.compare(narrow_with_nul)); diff --git a/base/strings/utf_string_conversions.cc b/base/strings/utf_string_conversions.cc index 9796eec..1480d48 100644 --- a/base/strings/utf_string_conversions.cc +++ b/base/strings/utf_string_conversions.cc @@ -209,11 +209,6 @@ std::string UTF16ToUTF8(const string16& utf16) { #endif -std::wstring ASCIIToWide(const StringPiece& ascii) { - DCHECK(IsStringASCII(ascii)) << ascii; - return std::wstring(ascii.begin(), ascii.end()); -} - string16 ASCIIToUTF16(const StringPiece& ascii) { DCHECK(IsStringASCII(ascii)) << ascii; return string16(ascii.begin(), ascii.end()); diff --git a/base/strings/utf_string_conversions.h b/base/strings/utf_string_conversions.h index 13e0b71..06a3bc6 100644 --- a/base/strings/utf_string_conversions.h +++ b/base/strings/utf_string_conversions.h @@ -39,9 +39,8 @@ BASE_EXPORT bool UTF16ToUTF8(const char16* src, size_t src_len, std::string* output); BASE_EXPORT std::string UTF16ToUTF8(const string16& utf16); -// These convert an ASCII string, typically a hardcoded constant, to a -// UTF16/Wide string. -BASE_EXPORT std::wstring ASCIIToWide(const StringPiece& ascii); +// This converts an ASCII string, typically a hardcoded constant, to a UTF16 +// string. BASE_EXPORT string16 ASCIIToUTF16(const StringPiece& ascii); // Converts to 7-bit ASCII by truncating. The result must be known to be ASCII |