Merge-60 [Payments] Record abort reasons on desktop.

components/payments/content/payment_request.cc

 // 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.
 
 #include "components/payments/content/payment_request.h"
 
 #include <string>
 #include <utility>
 
 #include "base/memory/ptr_util.h"
@@ skipping 138 matching lines @@
 
 void PaymentRequest::Abort() {
   // The API user has decided to abort. If a successful abort message is
   // returned to the renderer, the Mojo message pipe is closed, which triggers
   // PaymentRequest::OnConnectionTerminated, which destroys this object.
   // Otherwise, the abort promise is rejected and the pipe is not closed.
   // The abort is only successful if the payment app wasn't yet invoked.
   // TODO(crbug.com/716546): Add a merchant abort metric
 
   bool accepting_abort = !state_->IsPaymentAppInvoked();
-  if (accepting_abort) {
-    RecordFirstCompletionStatus(JourneyLogger::COMPLETION_STATUS_OTHER_ABORTED);
-  }
+  if (accepting_abort)
+    RecordFirstAbortReason(JourneyLogger::ABORT_REASON_ABORTED_BY_MERCHANT);
 
   if (client_.is_bound())
     client_->OnAbort(accepting_abort);
 
   if (observer_for_testing_)
     observer_for_testing_->OnAbortCalled();
 }
 
 void PaymentRequest::Complete(mojom::PaymentComplete result) {
   if (!client_.is_bound())
     return;
 
   if (result != mojom::PaymentComplete::SUCCESS) {
     delegate_->ShowErrorMessage();
   } else {
+    DCHECK(!has_recorded_completion_);
     journey_logger_.SetCompleted();
+    has_recorded_completion_ = true;
+
     delegate_->GetPrefService()->SetBoolean(kPaymentsFirstTransactionCompleted,
                                             true);
     // When the renderer closes the connection,
     // PaymentRequest::OnConnectionTerminated will be called.
     client_->OnComplete();
     state_->RecordUseStats();
   }
 }
 
 void PaymentRequest::CanMakePayment() {
@@ skipping 39 matching lines @@
     mojom::PaymentAddressPtr address) {
   client_->OnShippingAddressChange(std::move(address));
 }
 
 void PaymentRequest::UserCancelled() {
   // If |client_| is not bound, then the object is already being destroyed as
   // a result of a renderer event.
   if (!client_.is_bound())
     return;
 
-  RecordFirstCompletionStatus(JourneyLogger::COMPLETION_STATUS_USER_ABORTED);
+  RecordFirstAbortReason(JourneyLogger::ABORT_REASON_ABORTED_BY_USER);
 
   // This sends an error to the renderer, which informs the API user.
   client_->OnError(mojom::PaymentErrorReason::USER_CANCEL);
 
   // We close all bindings and ask to be destroyed.
   client_.reset();
   binding_.Close();
   if (observer_for_testing_)
     observer_for_testing_->OnConnectionTerminated();
   manager_->DestroyRequest(this);
 }
 
 void PaymentRequest::DidStartNavigation(bool is_user_initiated) {
-  RecordFirstCompletionStatus(
-      is_user_initiated ? JourneyLogger::COMPLETION_STATUS_USER_ABORTED
-                        : JourneyLogger::COMPLETION_STATUS_OTHER_ABORTED);
+  RecordFirstAbortReason(is_user_initiated
+                             ? JourneyLogger::ABORT_REASON_USER_NAVIGATION
+                             : JourneyLogger::ABORT_REASON_MERCHANT_NAVIGATION);
 }
 
 void PaymentRequest::OnConnectionTerminated() {
   // We are here because of a browser-side error, or likely as a result of the
   // connection_error_handler on |binding_|, which can mean that the renderer
   // has decided to close the pipe for various reasons (see all uses of
   // PaymentRequest::clearResolversAndCloseMojoConnection() in Blink). We close
   // the binding and the dialog, and ask to be deleted.
   client_.reset();
   binding_.Close();
   delegate_->CloseDialog();
   if (observer_for_testing_)
     observer_for_testing_->OnConnectionTerminated();
+
+  RecordFirstAbortReason(JourneyLogger::ABORT_REASON_MOJO_CONNECTION_ERROR);
   manager_->DestroyRequest(this);
 }
 
 void PaymentRequest::Pay() {
   state_->GeneratePaymentResponse();
 }
 
-void PaymentRequest::RecordFirstCompletionStatus(
-    JourneyLogger::CompletionStatus completion_status) {
-  if (!has_recorded_abort_reason_) {
-    has_recorded_abort_reason_ = true;
-    // TODO(crbug.com/716546): Record more abort reasons.
-    if (completion_status == JourneyLogger::COMPLETION_STATUS_USER_ABORTED) {
-      journey_logger_.SetAborted(JourneyLogger::ABORT_REASON_ABORTED_BY_USER);
-    } else {
-      journey_logger_.SetAborted(JourneyLogger::ABORT_REASON_OTHER);
-    }
+void PaymentRequest::RecordFirstAbortReason(
+    JourneyLogger::AbortReason abort_reason) {
+  if (!has_recorded_completion_) {
+    has_recorded_completion_ = true;
+    journey_logger_.SetAborted(abort_reason);
   }
 }
 
 }  // namespace payments