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

chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java

 // Copyright 2016 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.
 
 package org.chromium.chrome.browser.payments;
 
 import android.app.Activity;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.os.Handler;
@@ skipping 248 matching lines @@
     private List<PaymentInstrument> mPendingInstruments;
     private List<PaymentInstrument> mPendingAutofillInstruments;
     private SectionInformation mPaymentMethodsSection;
     private PaymentRequestUI mUI;
     private Callback<PaymentInformation> mPaymentInformationCallback;
     private boolean mPaymentAppRunning;
     private boolean mMerchantSupportsAutofillPaymentInstruments;
     private ContactEditor mContactEditor;
     private boolean mHasRecordedAbortReason;
     private boolean mQueriedCanMakePayment;
-    private CurrencyStringFormatter mFormatter;
+    private CurrencyFormatter mCurrencyFormatter;
 
     /** True if any of the requested payment methods are supported. */
     private boolean mArePaymentMethodsSupported;
 
     /**
      * True after at least one usable payment instrument has been found. Should be read only after
      * all payment apps have been queried.
      */
     private boolean mCanMakePayment;
 
@@ skipping 39 matching lines @@
         mApps = new ArrayList<>();
 
         mAddressEditor = new AddressEditor();
         mCardEditor = new CardEditor(webContents, mAddressEditor, sObserverForTest);
 
         if (sCanMakePaymentQueries == null) sCanMakePaymentQueries = new ArrayMap<>();
 
         recordSuccessFunnelHistograms("Initiated");
     }
 
+    protected void finalize() throws Throwable {
+        super.finalize();
+        if (mCurrencyFormatter != null) {
+            // Ensures the native implementation of currency formatter does not leak.
+            mCurrencyFormatter.destroy();
+        }
+    }
+
     /**
      * Called by the merchant website to initialize the payment request data.
      */
     @Override
     public void init(PaymentRequestClient client, PaymentMethodData[] methodData,
             PaymentDetails details, PaymentOptions options) {
         if (mClient != null || client == null) return;
         mClient = client;
 
         if (mMethodData != null) {
@@ skipping 249 matching lines @@
      * @return True if the data is valid. False if the data is invalid.
      */
     private boolean parseAndValidateDetailsOrDisconnectFromClient(PaymentDetails details) {
         if (!PaymentValidator.validatePaymentDetails(details)) {
             disconnectFromClientWithDebugMessage("Invalid payment details");
             recordAbortReasonHistogram(
                     PaymentRequestMetrics.ABORT_REASON_INVALID_DATA_FROM_RENDERER);
             return false;
         }
 
-        if (mFormatter == null) {
-            mFormatter = new CurrencyStringFormatter(details.total.amount.currency,
-                    Locale.getDefault());
+        if (mCurrencyFormatter == null) {
+            mCurrencyFormatter = new CurrencyFormatter(details.total.amount.currency,
+                    details.total.amount.currencySystem, Locale.getDefault());
         }
 
         // Total is never pending.
-        LineItem uiTotal = new LineItem(
-                details.total.label, mFormatter.getFormattedCurrencyCode(),
-                mFormatter.format(details.total.amount.value), /* isPending */ false);
+        LineItem uiTotal = new LineItem(details.total.label,
+                mCurrencyFormatter.getFormattedCurrencyCode(),
+                mCurrencyFormatter.format(details.total.amount.value), /* isPending */ false);
 
-        List<LineItem> uiLineItems = getLineItems(details.displayItems, mFormatter);
+        List<LineItem> uiLineItems = getLineItems(details.displayItems, mCurrencyFormatter);
 
         mUiShoppingCart = new ShoppingCart(uiTotal, uiLineItems);
         mRawTotal = details.total;
         mRawLineItems = Collections.unmodifiableList(Arrays.asList(details.displayItems));
 
-        mUiShippingOptions = getShippingOptions(details.shippingOptions, mFormatter);
+        mUiShippingOptions = getShippingOptions(details.shippingOptions, mCurrencyFormatter);
 
         for (int i = 0; i < details.modifiers.length; i++) {
             PaymentDetailsModifier modifier = details.modifiers[i];
             String[] methods = modifier.methodData.supportedMethods;
             for (int j = 0; j < methods.length; j++) {
                 if (mModifiers == null) mModifiers = new ArrayMap<>();
                 mModifiers.put(methods[j], modifier);
             }
         }
 
         updateInstrumentModifiedTotals();
 
         return true;
     }
 
     /** Updates the modifiers for payment instruments and order summary. */
     private void updateInstrumentModifiedTotals() {
         if (!ChromeFeatureList.isEnabled(ChromeFeatureList.WEB_PAYMENTS_MODIFIERS)) return;
         if (mModifiers == null) return;
         if (mPaymentMethodsSection == null) return;
 
         for (int i = 0; i < mPaymentMethodsSection.getSize(); i++) {
             PaymentInstrument instrument = (PaymentInstrument) mPaymentMethodsSection.getItem(i);
             PaymentDetailsModifier modifier = getModifier(instrument);
-            instrument.setModifiedTotal(modifier == null || modifier.total == null ? null
-                    : mFormatter.format(modifier.total.amount.value));
+            instrument.setModifiedTotal(modifier == null || modifier.total == null
+                            ? null
+                            : mCurrencyFormatter.format(modifier.total.amount.value));
         }
 
         updateOrderSummary((PaymentInstrument) mPaymentMethodsSection.getSelectedItem());
     }
 
     /** Sets the modifier for the order summary based on the given instrument, if any. */
     private void updateOrderSummary(@Nullable PaymentInstrument instrument) {
         if (!ChromeFeatureList.isEnabled(ChromeFeatureList.WEB_PAYMENTS_MODIFIERS)) return;
 
         PaymentDetailsModifier modifier = getModifier(instrument);
         PaymentItem total = modifier == null ? null : modifier.total;
         if (total == null) total = mRawTotal;
 
-        mUiShoppingCart.setTotal(new LineItem(total.label, mFormatter.getFormattedCurrencyCode(),
-                mFormatter.format(total.amount.value), false /* isPending */));
-        mUiShoppingCart.setAdditionalContents(modifier == null ? null
-                : getLineItems(modifier.additionalDisplayItems, mFormatter));
+        mUiShoppingCart.setTotal(
+                new LineItem(total.label, mCurrencyFormatter.getFormattedCurrencyCode(),
+                        mCurrencyFormatter.format(total.amount.value), false /* isPending */));
+        mUiShoppingCart.setAdditionalContents(modifier == null
+                        ? null
+                        : getLineItems(modifier.additionalDisplayItems, mCurrencyFormatter));
         mUI.updateOrderSummarySection(mUiShoppingCart);
     }
 
     /** @return The first modifier that matches the given instrument, or null. */
     @Nullable private PaymentDetailsModifier getModifier(@Nullable PaymentInstrument instrument) {
         if (instrument == null) return null;
         Set<String> methodNames = instrument.getInstrumentMethodNames();
         methodNames.retainAll(mModifiers.keySet());
         return methodNames.isEmpty() ? null : mModifiers.get(methodNames.iterator().next());
     }
 
     /**
      * Converts a list of payment items and returns their parsed representation.
      *
      * @param items     The payment items to parse. Can be null.
      * @param formatter A formatter for the currency amount value.
      * @return A list of valid line items.
      */
     private static List<LineItem> getLineItems(
-            @Nullable PaymentItem[] items, CurrencyStringFormatter formatter) {
+            @Nullable PaymentItem[] items, CurrencyFormatter formatter) {
         // Line items are optional.
         if (items == null) return new ArrayList<>();
 
         List<LineItem> result = new ArrayList<>(items.length);
         for (int i = 0; i < items.length; i++) {
             PaymentItem item = items[i];
 
             result.add(new LineItem(
                     item.label, "", formatter.format(item.amount.value), item.pending));
         }
 
         return Collections.unmodifiableList(result);
     }
 
     /**
      * Converts a list of shipping options and returns their parsed representation.
      *
      * @param options   The raw shipping options to parse. Can be null.
      * @param formatter A formatter for the currency amount value.
      * @return The UI representation of the shipping options.
      */
     private static SectionInformation getShippingOptions(
-            @Nullable PaymentShippingOption[] options, CurrencyStringFormatter formatter) {
+            @Nullable PaymentShippingOption[] options, CurrencyFormatter formatter) {
         // Shipping options are optional.
         if (options == null || options.length == 0) {
             return new SectionInformation(PaymentRequestUI.TYPE_SHIPPING_OPTIONS);
         }
 
         List<PaymentOption> result = new ArrayList<>();
         int selectedItemIndex = SectionInformation.NO_SELECTION;
         for (int i = 0; i < options.length; i++) {
             PaymentShippingOption option = options[i];
             result.add(new PaymentOption(option.id, option.label,
@@ skipping 745 matching lines @@
                 "PaymentRequest.CheckoutFunnel.Aborted", abortReason,
                 PaymentRequestMetrics.ABORT_REASON_MAX);
 
         if (abortReason == PaymentRequestMetrics.ABORT_REASON_ABORTED_BY_USER) {
             mJourneyLogger.recordJourneyStatsHistograms("UserAborted");
         } else {
             mJourneyLogger.recordJourneyStatsHistograms("OtherAborted");
         }
     }
 }