[Payments] Use C++ metric enums in Java.

components/payments/core/journey_logger.h

 // 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.
 
 #ifndef COMPONENTS_PAYMENTS_CORE_JOURNEY_LOGGER_H_
 #define COMPONENTS_PAYMENTS_CORE_JOURNEY_LOGGER_H_
 
 #include <string>
 
 #include "base/macros.h"
@@ skipping 12 matching lines @@
 extern const char kUKMEventsMetricName[];
 }  // namespace internal
 
 // A class to keep track of different stats during a Payment Request journey. It
 // collects different metrics during the course of the checkout flow, like the
 // number of credit cards that the user added or edited. The metrics will be
 // logged when RecordJourneyStatsHistograms is called with the completion status
 // of the Payment Request.
 class JourneyLogger {
  public:
-  // Note: These constants should always be in sync with their counterpart in
-  // components/payments/content/android/java/src/org/chromium/components/
-  // payments/JourneyLogger.java.
+  // Note: Java counterparts will be generated for these enums.
+
   // The different sections of a Payment Request. Used to record journey
   // stats.
+  // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.chrome.browser.payments
+  // GENERATED_JAVA_CLASS_NAME_OVERRIDE: Section
   enum Section {
     SECTION_CONTACT_INFO = 0,
     SECTION_CREDIT_CARDS = 1,
     SECTION_SHIPPING_ADDRESS = 2,
     SECTION_MAX,
   };
 
   // For the CanMakePayment histograms.
+  // A Java counterpart will be generated for this enum.

[gogerald1, 2017/05/29 16:05:42]

no need this line since you comment and the beginning?

[sebsg, 2017/05/29 16:44:49]

Oops this one slipped past me, thanks!

+  // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.chrome.browser.payments
+  // GENERATED_JAVA_CLASS_NAME_OVERRIDE: CanMakePaymentUsage
   enum CanMakePaymentUsage {
     CAN_MAKE_PAYMENT_USED = 0,
     CAN_MAKE_PAYMENT_NOT_USED = 1,
     CAN_MAKE_PAYMENT_USE_MAX,
   };
 
+  // The information requested by the merchant.
+  // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.chrome.browser.payments
+  // GENERATED_JAVA_CLASS_NAME_OVERRIDE: RequestedInformation
+  enum RequestedInformation {
+    REQUESTED_INFORMATION_NONE = 0,
+    REQUESTED_INFORMATION_EMAIL = 1 << 0,
+    REQUESTED_INFORMATION_PHONE = 1 << 1,
+    REQUESTED_INFORMATION_SHIPPING = 1 << 2,
+    REQUESTED_INFORMATION_NAME = 1 << 3,
+    REQUESTED_INFORMATION_MAX = 16,
+  };
+
+  // The payment method that was used by the user to complete the transaction.
+  // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.chrome.browser.payments
+  // GENERATED_JAVA_CLASS_NAME_OVERRIDE: SelectedPaymentMethod
+  enum SelectedPaymentMethod {
+    SELECTED_PAYMENT_METHOD_CREDIT_CARD = 0,
+    SELECTED_PAYMENT_METHOD_ANDROID_PAY = 1,
+    SELECTED_PAYMENT_METHOD_OTHER_PAYMENT_APP = 2,
+    SELECTED_PAYMENT_METHOD_MAX = 3,
+  };
+
+  // Used to mesure the impact of the CanMakePayment return value on whether the
+  // Payment Request is shown to the user.
+  // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.chrome.browser.payments
+  // GENERATED_JAVA_CLASS_NAME_OVERRIDE: CanMakePaymentEffectOnShow
+  enum CmpEffectOnShow {
+    CMP_EFFECT_ON_SHOW_COULD_NOT_MAKE_PAYMENT_AND_DID_NOT_SHOW = 0,
+    CMP_EFFECT_ON_SHOW_DID_SHOW = 1 << 0,
+    CMP_EFFECT_ON_SHOW_COULD_MAKE_PAYMENT = 1 << 1,
+    CMP_EFFECT_ON_SHOW_MAX = 4,
+  };
+
   // Used to log different parameters' effect on whether the transaction was
   // completed.
+  // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.chrome.browser.payments
+  // GENERATED_JAVA_CLASS_NAME_OVERRIDE: CompletionStatus
   enum CompletionStatus {
     COMPLETION_STATUS_COMPLETED = 0,
     COMPLETION_STATUS_USER_ABORTED = 1,
     COMPLETION_STATUS_OTHER_ABORTED = 2,
     COMPLETION_STATUS_MAX,
   };
 
   // Used to record the different events that happened during the Payment
   // Request.
+  // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.chrome.browser.payments
+  // GENERATED_JAVA_CLASS_NAME_OVERRIDE: Event
   enum Event {
     EVENT_INITIATED = 0,
     EVENT_SHOWN = 1 << 0,
     EVENT_PAY_CLICKED = 1 << 1,
     EVENT_RECEIVED_INSTRUMENT_DETAILS = 1 << 2,
     EVENT_SKIPPED_SHOW = 1 << 3,
-    EVENT_ENUM_MAX = 16,
+    EVENT_MAX = 16,
   };
 
+  // The reason why the Payment Request was aborted.
+  // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.chrome.browser.payments
+  // GENERATED_JAVA_CLASS_NAME_OVERRIDE: AbortReason
   enum AbortReason {
     ABORT_REASON_ABORTED_BY_USER = 0,
     ABORT_REASON_ABORTED_BY_MERCHANT = 1,
     ABORT_REASON_INVALID_DATA_FROM_RENDERER = 2,
     ABORT_REASON_MOJO_CONNECTION_ERROR = 3,
     ABORT_REASON_MOJO_RENDERER_CLOSING = 4,
     ABORT_REASON_INSTRUMENT_DETAILS_ERROR = 5,
     ABORT_REASON_NO_MATCHING_PAYMENT_METHOD = 6,   // Deprecated.
     ABORT_REASON_NO_SUPPORTED_PAYMENT_METHOD = 7,  // Deprecated.
     ABORT_REASON_OTHER = 8,
     ABORT_REASON_MAX,
   };
 
 #ifdef OS_ANDROID
+  // The reason why the Payment Request was not shown to the user.
+  // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.chrome.browser.payments
+  // GENERATED_JAVA_CLASS_NAME_OVERRIDE: NotShownReason
   enum NotShownReason {
-    NOT_SHOWN_NO_MATCHING_PAYMENT_METHOD = 0,
-    NOT_SHOWN_NO_SUPPORTED_PAYMENT_METHOD = 1,
-    NOT_SHOWN_CONCURRENT_REQUESTS = 2,
+    NOT_SHOWN_REASON_NO_MATCHING_PAYMENT_METHOD = 0,
+    NOT_SHOWN_REASON_NO_SUPPORTED_PAYMENT_METHOD = 1,
+    NOT_SHOWN_REASON_CONCURRENT_REQUESTS = 2,
     NOT_SHOWN_REASON_OTHER = 3,
     NOT_SHOWN_REASON_MAX = 4,
   };
 #endif
 
-  // Used to mesure the impact of the CanMakePayment return value on whether the
-  // Payment Request is shown to the user.
-  static const int CMP_SHOW_COULD_NOT_MAKE_PAYMENT_AND_DID_NOT_SHOW = 0;
-  static const int CMP_SHOW_DID_SHOW = 1 << 0;
-  static const int CMP_SHOW_COULD_MAKE_PAYMENT = 1 << 1;
-  static const int CMP_SHOW_MAX = 4;
-
   JourneyLogger(bool is_incognito,
                 const GURL& url,
                 ukm::UkmRecorder* ukm_recorder);
   ~JourneyLogger();
 
   // Increments the number of selection adds for the specified section.
   void IncrementSelectionAdds(Section section);
 
   // Increments the number of selection changes for the specified section.
   void IncrementSelectionChanges(Section section);
@@ skipping 99 matching lines @@
 
   // Not owned, will outlive this object.
   ukm::UkmRecorder* ukm_recorder_;
 
   DISALLOW_COPY_AND_ASSIGN(JourneyLogger);
 };
 
 }  // namespace payments
 
 #endif  // COMPONENTS_PAYMENTS_CORE_JOURNEY_LOGGER_H_