From c30a6232df03e1efbd9f3b226777b07e087a1122 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 12 Oct 2020 14:27:29 +0200 Subject: BASELINE: Update Chromium to 85.0.4183.140 Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen --- chromium/base/strings/utf_string_conversions.cc | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'chromium/base/strings/utf_string_conversions.cc') diff --git a/chromium/base/strings/utf_string_conversions.cc b/chromium/base/strings/utf_string_conversions.cc index 9a79889159e..0b55cd9e59d 100644 --- a/chromium/base/strings/utf_string_conversions.cc +++ b/chromium/base/strings/utf_string_conversions.cc @@ -339,4 +339,16 @@ std::string UTF16ToASCII(StringPiece16 utf16) { return std::string(utf16.begin(), utf16.end()); } +#if defined(WCHAR_T_IS_UTF16) +std::wstring ASCIIToWide(StringPiece ascii) { + DCHECK(IsStringASCII(ascii)) << ascii; + return std::wstring(ascii.begin(), ascii.end()); +} + +std::string WideToASCII(WStringPiece wide) { + DCHECK(IsStringASCII(wide)) << wide; + return std::string(wide.begin(), wide.end()); +} +#endif // defined(WCHAR_T_IS_UTF16) + } // namespace base -- cgit v1.2.1