[Payments] Record navigations that close the Payment Request as aborts.

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 132 matching lines @@
     return;
   }
   spec_->UpdateWith(std::move(details));
 }
 
 void PaymentRequest::Abort() {
   // The API user has decided to abort. We return a successful abort message to
   // the renderer, which closes the Mojo message pipe, which triggers
   // PaymentRequest::OnConnectionTerminated, which destroys this object.
   // TODO(crbug.com/716546): Add a merchant abort metric,
-  journey_logger_.RecordJourneyStatsHistograms(
-      JourneyLogger::COMPLETION_STATUS_OTHER_ABORTED);
+  if (!has_recorded_abort_reason_) {

[Mathieu, 2017/05/10 20:23:07]

as discussed let's move this to a private method

+    has_recorded_abort_reason_ = true;
+    journey_logger_.RecordJourneyStatsHistograms(
+        JourneyLogger::COMPLETION_STATUS_OTHER_ABORTED);
+  }
   if (client_.is_bound())
     client_->OnAbort(true /* aborted_successfully */);
 }
 
 void PaymentRequest::Complete(mojom::PaymentComplete result) {
   if (!client_.is_bound())
     return;
 
   if (result != mojom::PaymentComplete::SUCCESS) {
     delegate_->ShowErrorMessage();
@@ skipping 49 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;
 
-  journey_logger_.RecordJourneyStatsHistograms(
-      JourneyLogger::COMPLETION_STATUS_USER_ABORTED);
+  if (!has_recorded_abort_reason_) {
+    has_recorded_abort_reason_ = true;
+    journey_logger_.RecordJourneyStatsHistograms(
+        JourneyLogger::COMPLETION_STATUS_USER_ABORTED);
+  }
 
   // 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) {
+  if (!has_recorded_abort_reason_) {
+    has_recorded_abort_reason_ = true;
+    journey_logger_.RecordJourneyStatsHistograms(
+        is_user_initiated ? JourneyLogger::COMPLETION_STATUS_USER_ABORTED
+                          : JourneyLogger::COMPLETION_STATUS_OTHER_ABORTED);
+  }
+}
+
 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();
   manager_->DestroyRequest(this);
 }
 
 void PaymentRequest::Pay() {
   state_->GeneratePaymentResponse();
 }
 
 }  // namespace payments