| Index: base/utf_string_conversions.cc
|
| diff --git a/base/utf_string_conversions.cc b/base/utf_string_conversions.cc
|
| index 41a70db9283151f48d957bd6ba0b9233d624f8be..7b73696e0cac61e590873694801ee3b3ae40cc04 100644
|
| --- a/base/utf_string_conversions.cc
|
| +++ b/base/utf_string_conversions.cc
|
| @@ -133,7 +133,7 @@ bool UTF8ToUTF16(const char* src, size_t src_len, string16* output) {
|
| return ConvertUnicode(src, src_len, output);
|
| }
|
|
|
| -string16 UTF8ToUTF16(const std::string& utf8) {
|
| +string16 UTF8ToUTF16(const base::StringPiece& utf8) {
|
| string16 ret;
|
| // Ignore the success flag of this call, it will do the best it can for
|
| // invalid input, which is what we want here.
|
| @@ -161,7 +161,7 @@ bool UTF8ToUTF16(const char* src, size_t src_len, string16* output) {
|
| return UTF8ToWide(src, src_len, output);
|
| }
|
|
|
| -string16 UTF8ToUTF16(const std::string& utf8) {
|
| +string16 UTF8ToUTF16(const base::StringPiece& utf8) {
|
| return UTF8ToWide(utf8);
|
| }
|
|
|
| @@ -175,22 +175,12 @@ std::string UTF16ToUTF8(const string16& utf16) {
|
|
|
| #endif
|
|
|
| -std::wstring ASCIIToWide(const char* ascii) {
|
| - DCHECK(IsStringASCII(ascii)) << ascii;
|
| - return std::wstring(ascii, &ascii[strlen(ascii)]);
|
| -}
|
| -
|
| -std::wstring ASCIIToWide(const std::string& ascii) {
|
| +std::wstring ASCIIToWide(const base::StringPiece& ascii) {
|
| DCHECK(IsStringASCII(ascii)) << ascii;
|
| return std::wstring(ascii.begin(), ascii.end());
|
| }
|
|
|
| -string16 ASCIIToUTF16(const char* ascii) {
|
| - DCHECK(IsStringASCII(ascii)) << ascii;
|
| - return string16(ascii, &ascii[strlen(ascii)]);
|
| -}
|
| -
|
| -string16 ASCIIToUTF16(const std::string& ascii) {
|
| +string16 ASCIIToUTF16(const base::StringPiece& ascii) {
|
| DCHECK(IsStringASCII(ascii)) << ascii;
|
| return string16(ascii.begin(), ascii.end());
|
| }
|
|
|