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

components/payments/core/journey_logger.cc

 // 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.
 
 #include "components/payments/core/journey_logger.h"
 
 #include <algorithm>
 
 #include "base/metrics/histogram_functions.h"
 #include "base/metrics/histogram_macros.h"
@@ skipping 224 matching lines @@
   RecordCanMakePaymentEffectOnShow();
   RecordCanMakePaymentEffectOnCompletion(completion_status);
 }
 
 void JourneyLogger::RecordCanMakePaymentEffectOnShow() {
   if (!was_can_make_payments_used_)
     return;
 
   int effect_on_show = 0;
   if (was_show_called_)
-    effect_on_show |= CMP_SHOW_DID_SHOW;
+    effect_on_show |= CMP_EFFECT_ON_SHOW_DID_SHOW;
   if (could_make_payment_)
-    effect_on_show |= CMP_SHOW_COULD_MAKE_PAYMENT;
+    effect_on_show |= CMP_EFFECT_ON_SHOW_COULD_MAKE_PAYMENT;
 
   UMA_HISTOGRAM_ENUMERATION("PaymentRequest.CanMakePayment.Used.EffectOnShow",
-                            effect_on_show, CMP_SHOW_MAX);
+                            effect_on_show, CMP_EFFECT_ON_SHOW_MAX);
 }
 
 void JourneyLogger::RecordCanMakePaymentEffectOnCompletion(
     CompletionStatus completion_status) {
   if (!was_show_called_)
     return;
 
   std::string histogram_name = "PaymentRequest.CanMakePayment.";
   if (!was_can_make_payments_used_) {
     histogram_name += "NotUsed.WithShowEffectOnCompletion";
@@ skipping 16 matching lines @@
   ukm_recorder_->UpdateSourceURL(source_id, url_);
   std::unique_ptr<ukm::UkmEntryBuilder> builder =
       ukm_recorder_->GetEntryBuilder(source_id,
                                      internal::kUKMCheckoutEventsEntryName);
   builder->AddMetric(internal::kUKMCompletionStatusMetricName,
                      completion_status);
   builder->AddMetric(internal::kUKMEventsMetricName, events_);
 }
 
 }  // namespace payments