Prepare Chromium and Blink for ICU 59

base/i18n/message_formatter.cc

 // Copyright 2015 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/i18n/message_formatter.h"
 
+#include "base/i18n/unicodestring.h"
 #include "base/logging.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/time/time.h"
 #include "third_party/icu/source/common/unicode/unistr.h"
 #include "third_party/icu/source/common/unicode/utypes.h"
 #include "third_party/icu/source/i18n/unicode/fmtable.h"
 #include "third_party/icu/source/i18n/unicode/msgfmt.h"
 
 using icu::UnicodeString;
 
@@ skipping 67 matching lines @@
   UErrorCode error = U_ZERO_ERROR;
   icu::MessageFormat format(msg_string,  error);
   icu::UnicodeString formatted;
   icu::FieldPosition ignore(icu::FieldPosition::DONT_CARE);
   format.format(args, args_count, formatted, ignore, error);
   if (U_FAILURE(error)) {
     LOG(ERROR) << "MessageFormat(" << msg.as_string() << ") failed with "
                << u_errorName(error);
     return string16();
   }
-  return string16(formatted.getBuffer(), formatted.length());
+  return i18n::UnicodeStringToString16(formatted);
 }
 
 string16 MessageFormatter::FormatWithNamedArgs(
     StringPiece16 msg,
     StringPiece name0, const internal::MessageArg& arg0,
     StringPiece name1, const internal::MessageArg& arg1,
     StringPiece name2, const internal::MessageArg& arg2,
     StringPiece name3, const internal::MessageArg& arg3,
     StringPiece name4, const internal::MessageArg& arg4,
     StringPiece name5, const internal::MessageArg& arg5,
@@ skipping 22 matching lines @@
   UErrorCode error = U_ZERO_ERROR;
   icu::MessageFormat format(msg_string, error);
 
   icu::UnicodeString formatted;
   format.format(names, args, args_count, formatted, error);
   if (U_FAILURE(error)) {
     LOG(ERROR) << "MessageFormat(" << msg.as_string() << ") failed with "
                << u_errorName(error);
     return string16();
   }
-  return string16(formatted.getBuffer(), formatted.length());
+  return i18n::UnicodeStringToString16(formatted);
 }
 
 }  // namespace i18n
 }  // namespace base