Use StringPiece for UTF string conversions.

base/strings/utf_string_conversions.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 "base/strings/utf_string_conversions.h"
 
 #include "base/strings/string_piece.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversion_utils.h"
 
@@ skipping 107 matching lines @@
   UTF16ToWide(utf16.data(), utf16.length(), &ret);
   return ret;
 }
 
 #endif  // defined(WCHAR_T_IS_UTF32)
 
 // UTF16 <-> UTF8 --------------------------------------------------------------
 
 #if defined(WCHAR_T_IS_UTF32)
 
-bool UTF8ToUTF16(const char* src, size_t src_len, string16* output) {
-  PrepareForUTF16Or32Output(src, src_len, output);
-  return ConvertUnicode(src, src_len, output);
+bool UTF8ToUTF16(const StringPiece& utf8, string16* output) {
+  PrepareForUTF16Or32Output(utf8.data(), utf8.size(), output);
+  return ConvertUnicode(utf8.data(), utf8.size(), output);
 }
 
 string16 UTF8ToUTF16(const 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.
-  UTF8ToUTF16(utf8.data(), utf8.length(), &ret);
+  UTF8ToUTF16(utf8, &ret);
   return ret;
 }
 
-bool UTF16ToUTF8(const char16* src, size_t src_len, std::string* output) {
-  PrepareForUTF8Output(src, src_len, output);
-  return ConvertUnicode(src, src_len, output);
+bool UTF16ToUTF8(const StringPiece16& utf16, std::string* output) {
+  PrepareForUTF8Output(utf16.data(), utf16.length(), output);
+  return ConvertUnicode(utf16.data(), utf16.length(), output);
 }
 
 std::string UTF16ToUTF8(const string16& utf16) {
   std::string ret;
   // Ignore the success flag of this call, it will do the best it can for
   // invalid input, which is what we want here.
-  UTF16ToUTF8(utf16.data(), utf16.length(), &ret);
+  UTF16ToUTF8(utf16, &ret);
   return ret;
 }
 
 #elif defined(WCHAR_T_IS_UTF16)
 // Easy case since we can use the "wide" versions we already wrote above.
 
-bool UTF8ToUTF16(const char* src, size_t src_len, string16* output) {
-  return UTF8ToWide(src, src_len, output);
+bool UTF8ToUTF16(const StringPiece& utf8, string16* output) {
+  return UTF8ToWide(utf8.data(), utf8.size(), output);
 }
 
 string16 UTF8ToUTF16(const StringPiece& utf8) {
   return UTF8ToWide(utf8);
 }
 
-bool UTF16ToUTF8(const char16* src, size_t src_len, std::string* output) {
-  return WideToUTF8(src, src_len, output);
+bool UTF16ToUTF8(const StringPiece16& utf16, std::string* output) {
+  return WideToUTF8(utf16.data(), utf16.size(), output);
 }
 
 std::string UTF16ToUTF8(const string16& utf16) {
   return WideToUTF8(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());
 }
 
 }  // namespace base