PaymentRequest: The currencySystem should be non-nullable.

components/payments/android/currency_formatter_android.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/android/currency_formatter_android.h"
 
 #include "base/android/jni_string.h"
 #include "base/optional.h"
 #include "base/strings/string16.h"
 #include "components/payments/currency_formatter.h"
 #include "jni/CurrencyFormatter_jni.h"
 
 using base::android::JavaParamRef;
 using base::android::ConvertJavaStringToUTF8;
 
 namespace payments {
 
 CurrencyFormatterAndroid::CurrencyFormatterAndroid(
     JNIEnv* env,
     jobject unused_obj,
     const JavaParamRef<jstring>& currency_code,
     const JavaParamRef<jstring>& currency_system,
     const JavaParamRef<jstring>& locale_name) {
   std::string currency_system_str =
       ConvertJavaStringToUTF8(env, currency_system);
 
   currency_formatter_.reset(new CurrencyFormatter(
-      ConvertJavaStringToUTF8(env, currency_code),
-      currency_system_str.empty()
-          ? base::Optional<std::string>()
-          : base::Optional<std::string>(currency_system_str),
+      ConvertJavaStringToUTF8(env, currency_code), currency_system_str,
       ConvertJavaStringToUTF8(env, locale_name)));
 }
 
 CurrencyFormatterAndroid::~CurrencyFormatterAndroid() {}
 
 void CurrencyFormatterAndroid::Destroy(JNIEnv* env,
                                        const JavaParamRef<jobject>& obj) {
   delete this;
 }
 
@@ skipping 25 matching lines @@
     const JavaParamRef<jstring>& currency_code,
     const JavaParamRef<jstring>& currency_system,
     const JavaParamRef<jstring>& locale_name) {
   CurrencyFormatterAndroid* currency_formatter_android =
       new CurrencyFormatterAndroid(env, obj, currency_code, currency_system,
                                    locale_name);
   return reinterpret_cast<intptr_t>(currency_formatter_android);
 }
 
 }  // namespace payments