[Payment Request] Update the CurrencyStringFormatter to call the native impl.

components/payments/currency_formatter.cc

 // Copyright 2017 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 "components/payments/currency_formatter.h"
 
 #include <memory>
 
 #include "base/numerics/safe_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "third_party/icu/source/common/unicode/stringpiece.h"
 #include "third_party/icu/source/common/unicode/uchar.h"
 #include "third_party/icu/source/common/unicode/unistr.h"
 #include "third_party/icu/source/common/unicode/utypes.h"
 
 namespace payments {
 
 const char kIso4217CurrencySystem[] = "urn:iso:std:iso:4217";
+
 namespace {
 
 // Support a maximum of 10 fractional digits, similar to the ISO20022 standard.
 // https://www.iso20022.org/standardsrepository/public/wqt/Description/mx/dico/
 //   datatypes/_L8ZcEp0gEeOo48XfssNw8w
 const int kMaximumNumFractionalDigits = 10;
 
 // Max currency code length. Length of currency code can be at most 2048.
 const static size_t kMaxCurrencyCodeLength = 2048;
 
@@ skipping 10 matching lines @@
 
 CurrencyFormatter::CurrencyFormatter(
     const std::string& currency_code,
     const base::Optional<std::string> currency_system,
     const std::string& locale_name)
     : locale_(locale_name.c_str()) {
   UErrorCode error_code = U_ZERO_ERROR;
   icu_formatter_.reset(
       icu::NumberFormat::createCurrencyInstance(locale_, error_code));
   if (U_FAILURE(error_code)) {
-    icu::UnicodeString name;
-    std::string locale_str;
-    locale_.getDisplayName(name).toUTF8String(locale_str);
     LOG(ERROR) << "Failed to initialize the currency formatter for "
-               << locale_str;
+               << locale_name;
     return;
   }
 
   if (ShouldUseCurrencyCode(currency_code, currency_system)) {
     currency_code_.reset(new icu::UnicodeString(
         currency_code.c_str(),
         base::checked_cast<int32_t>(currency_code.size())));
   } else {
     // For non-ISO4217 currency system/code, we use a dummy code which is not
     // going to appear in the output (stripped in Format()). This is because ICU
@@ skipping 50 matching lines @@
   if (u_isUWhiteSpace(output[output.length() - 1])) {
     output.remove(output.length() - 1, 1);
   }
 
   std::string output_str;
   output.toUTF8String(output_str);
   return base::UTF8ToUTF16(output_str);
 }
 
 }  // namespace payments