[Merge-57] Only record abort metrics if the Payment Request was shown.

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 250 matching lines @@
     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 CurrencyFormatter mCurrencyFormatter;
 
+    /** Aborts should only be recorded if the Payment Request was shown to the user. */
+    private boolean mShouldRecordAbortReason;
+
     /** 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;
 
     /** The helper to create and fill the response to send to the merchant. */
@@ skipping 190 matching lines @@
 
         setIsShowing(true);
         if (disconnectIfNoPaymentMethodsSupported()) return;
 
         // Catch any time the user switches tabs. Because the dialog is modal, a user shouldn't be
         // allowed to switch tabs, which can happen if the user receives an external Intent.
         mContext.getTabModelSelector().addObserver(mSelectorObserver);
         mContext.getCurrentTabModel().addObserver(mTabModelObserver);
 
         mUI.show();
-        recordSuccessFunnelHistograms("Shown");
-        mJourneyLogger.setShowCalled();
     }
 
     private static Map<String, PaymentMethodData> getValidatedMethodData(
             PaymentMethodData[] methodData, CardEditor paymentMethodsCollector) {
         // Payment methodData are required.
         if (methodData == null || methodData.length == 0) return null;
         Map<String, PaymentMethodData> result = new ArrayMap<>();
         for (int i = 0; i < methodData.length; i++) {
             String[] methods = methodData[i].supportedMethods;
 
@@ skipping 250 matching lines @@
                 providePaymentInformation();
             }
         });
     }
 
     private void providePaymentInformation() {
         mPaymentInformationCallback.onResult(
                 new PaymentInformation(mUiShoppingCart, mShippingAddressesSection,
                         mUiShippingOptions, mContactSection, mPaymentMethodsSection));
         mPaymentInformationCallback = null;
+
+        recordSuccessFunnelHistograms("Shown");
+        mShouldRecordAbortReason = true;
+        mJourneyLogger.setShowCalled();
     }
 
     @Override
     public void getShoppingCart(final Callback<ShoppingCart> callback) {
         mHandler.post(new Runnable() {
             @Override
             public void run() {
                 callback.onResult(mUiShoppingCart);
             }
         });
@@ skipping 526 matching lines @@
         boolean userCanAddCreditCard = mMerchantSupportsAutofillPaymentInstruments
                 && !ChromeFeatureList.isEnabled(ChromeFeatureList.NO_CREDIT_CARD_ABORT);
 
         if (!mArePaymentMethodsSupported
                 || (getIsShowing() && !foundPaymentMethods && !userCanAddCreditCard)) {
             // All payment apps have responded, but none of them have instruments. It's possible to
             // add credit cards, but the merchant does not support them either. The payment request
             // must be rejected.
             disconnectFromClientWithDebugMessage("Requested payment methods have no instruments",
                     PaymentErrorReason.NOT_SUPPORTED);
-            recordAbortReasonHistogram(mArePaymentMethodsSupported
-                    ? PaymentRequestMetrics.ABORT_REASON_NO_MATCHING_PAYMENT_METHOD
-                    : PaymentRequestMetrics.ABORT_REASON_NO_SUPPORTED_PAYMENT_METHOD);
+            recordNoShowReasonHistogram(mArePaymentMethodsSupported
+                            ? PaymentRequestMetrics.NO_SHOW_NO_MATCHING_PAYMENT_METHOD
+                            : PaymentRequestMetrics.NO_SHOW_NO_SUPPORTED_PAYMENT_METHOD);
             if (sObserverForTest != null) sObserverForTest.onPaymentRequestServiceShowFailed();
             return true;
         }
 
         return false;
     }
 
     /** @return True after payment apps have been queried. */
     private boolean isFinishedQueryingPaymentApps() {
         return mPendingApps != null && mPendingApps.isEmpty() && mPendingInstruments.isEmpty();
@@ skipping 146 matching lines @@
         }
     }
 
     /**
      * Adds an entry to the aborted Payment Request histogram in the bucket corresponding to the
      * reason for aborting. Only records the initial reason for aborting, as some closing code calls
      * other closing code that can log too.
      */
     private void recordAbortReasonHistogram(int abortReason) {
         assert abortReason < PaymentRequestMetrics.ABORT_REASON_MAX;
-        if (mHasRecordedAbortReason) return;
+        if (mHasRecordedAbortReason || !mShouldRecordAbortReason) return;
 
         mHasRecordedAbortReason = true;
         RecordHistogram.recordEnumeratedHistogram(
                 "PaymentRequest.CheckoutFunnel.Aborted", abortReason,
                 PaymentRequestMetrics.ABORT_REASON_MAX);
 
         if (abortReason == PaymentRequestMetrics.ABORT_REASON_ABORTED_BY_USER) {
             mJourneyLogger.recordJourneyStatsHistograms("UserAborted");
         } else {
             mJourneyLogger.recordJourneyStatsHistograms("OtherAborted");
         }
     }
+    
+    /**
+     * Adds an entry to the NoShow Payment Request histogram in the bucket corresponding to the
+     * reason for not showing the Payment Request.
+     */
+    private void recordNoShowReasonHistogram(int reason) {
+        assert reason < PaymentRequestMetrics.NO_SHOW_REASON_MAX;
+
+        RecordHistogram.recordEnumeratedHistogram("PaymentRequest.CheckoutFunnel.NoShow", reason,
+                PaymentRequestMetrics.NO_SHOW_REASON_MAX);
+    }
 }