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

chrome/browser/payments/android/journey_logger_android.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 "chrome/browser/payments/android/journey_logger_android.h"
 
 #include "base/android/jni_string.h"
 #include "chrome/browser/browser_process.h"
 #include "jni/JourneyLogger_jni.h"
 #include "url/gurl.h"
@@ skipping 76 matching lines @@
     JNIEnv* env,
     const base::android::JavaParamRef<jobject>& jcaller) {
   journey_logger_.SetShowCalled();
 }
 
 void JourneyLoggerAndroid::SetEventOccurred(
     JNIEnv* env,
     const base::android::JavaParamRef<jobject>& jcaller,
     jint jevent) {
   DCHECK_GE(jevent, 0);
-  DCHECK_LT(jevent, JourneyLogger::Event::EVENT_ENUM_MAX);
+  DCHECK_LT(jevent, JourneyLogger::Event::EVENT_MAX);
   journey_logger_.SetEventOccurred(static_cast<JourneyLogger::Event>(jevent));
 }
 
 void JourneyLoggerAndroid::SetCompleted(
     JNIEnv* env,
     const base::android::JavaParamRef<jobject>& jcaller) {
   journey_logger_.SetCompleted();
 }
 
 void JourneyLoggerAndroid::SetAborted(
@@ skipping 18 matching lines @@
 static jlong InitJourneyLoggerAndroid(
     JNIEnv* env,
     const JavaParamRef<jobject>& jcaller,
     jboolean jis_incognito,
     const base::android::JavaParamRef<jstring>& jurl) {
   return reinterpret_cast<jlong>(new JourneyLoggerAndroid(
       jis_incognito, ConvertJavaStringToUTF8(env, jurl)));
 }
 
 }  // namespace payments