PaymentRequest: The currencySystem should be non-nullable.

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"
@@ skipping 18 matching lines @@
 const static size_t kMaxCurrencyCodeLength = 2048;
 
 // Currency codes longer than 6 characters get truncated to 5 + ellipsis.
 const static size_t kMaxCurrencyCodeDisplayedChars = 6;
 
 // Used to truncate long currency codes.
 const char kEllipsis[] = "\xE2\x80\xA6";
 
 // Returns whether the |currency_code| is valid to be used in ICU.
 bool ShouldUseCurrencyCode(const std::string& currency_code,
-                           const base::Optional<std::string> currency_system) {
-  return currency_system.value_or(kIso4217CurrencySystem) ==
-             kIso4217CurrencySystem &&
+                           const std::string& currency_system) {
+  return (currency_system.empty() ||
+          currency_system == kIso4217CurrencySystem) &&
          !currency_code.empty() &&
          currency_code.size() <= kMaxCurrencyCodeLength;
 }
 
 std::string FormatCurrencyCode(const std::string& currency_code) {
   return currency_code.length() < kMaxCurrencyCodeDisplayedChars
              ? currency_code
              : currency_code.substr(0, kMaxCurrencyCodeDisplayedChars - 1) +
                    kEllipsis;
 }
 
 }  // namespace
 
-CurrencyFormatter::CurrencyFormatter(
-    const std::string& currency_code,
-    const base::Optional<std::string> currency_system,
-    const std::string& locale_name)
+CurrencyFormatter::CurrencyFormatter(const std::string& currency_code,
+                                     const std::string& currency_system,
+                                     const std::string& locale_name)
     : locale_(locale_name.c_str()),
       formatted_currency_code_(FormatCurrencyCode(currency_code)) {
   UErrorCode error_code = U_ZERO_ERROR;
   icu_formatter_.reset(
       icu::NumberFormat::createCurrencyInstance(locale_, error_code));
   if (U_FAILURE(error_code)) {
     LOG(ERROR) << "Failed to initialize the currency formatter for "
                << locale_name;
     return;
   }
@@ skipping 58 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