Use the new java_cpp_enum rule in net.

This moves most of the generated Java enums under net/ to use the
java_cpp_enum rule removing the need for keeping the enums in
separate list files and the need for the .template files.

BUG=405532

Review URL: https://codereview.chromium.org/599493004

Cr-Commit-Position: refs/heads/master@{#297420}

android_webview/java_library_common.mk

@@ -39,8 +39,11 @@ LOCAL_SRC_FILES += \
 # Java files generated from .template rules. This list should match list of java dependencies in
 # android_webview/android_webview.gyp
 LOCAL_GENERATED_SOURCES := \
-$(call intermediates-dir-for,GYP,shared)/enums/window_open_disposition_java/org/chromium/ui/WindowOpenDisposition.java \
 $(call intermediates-dir-for,GYP,shared)/enums/bitmap_format_java/org/chromium/ui/gfx/BitmapFormat.java \
+$(call intermediates-dir-for,GYP,shared)/enums/cert_verify_status_android_java/org/chromium/net/CertVerifyStatusAndroid.java \
+$(call intermediates-dir-for,GYP,shared)/enums/certificate_mime_types_java/org/chromium/net/CertificateMimeType.java \
+$(call intermediates-dir-for,GYP,shared)/enums/private_key_types_java/org/chromium/net/PrivateKeyType.java \
+$(call intermediates-dir-for,GYP,shared)/enums/window_open_disposition_java/org/chromium/ui/WindowOpenDisposition.java \
 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/base/ApplicationState.java \
 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/base/MemoryPressureLevelList.java \
 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/browser/GestureEventType.java \
@@ -52,10 +55,7 @@ $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/browser/
 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/common/ResultCodes.java \
 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content_public/common/ScreenOrientationValues.java \
 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/media/AndroidImageFormat.java \
-$(call intermediates-dir-for,GYP,shared)/templates/org/chromium/net/CertificateMimeType.java \
-$(call intermediates-dir-for,GYP,shared)/templates/org/chromium/net/CertVerifyStatusAndroid.java \
 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/net/NetError.java \
-$(call intermediates-dir-for,GYP,shared)/templates/org/chromium/net/PrivateKeyType.java \
 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/ui/base/PageTransitionTypes.java \
 
 # content dependencies on java components that are provided by the system on

build/get_landmines.py

@@ -56,6 +56,8 @@ def print_landmines():
   print '[chromium-dev] PSA: clobber build needed for IDR_INSPECTOR_* compil...'
   print 'blink_resources.grd changed: crbug.com/400860'
   print 'ninja dependency cycle: crbug.com/408192'
+  if platform() == 'android':
+    print 'Clobber: To delete stale generated .java files.'
 
 
 def main():

net/android/BUILD.gn

@@ -12,10 +12,8 @@ android_library("net_java") {
   ]
 
   srcjar_deps = [
-    ":cert_verify_status_android_java",
-    ":certificate_mime_types_java",
     ":net_errors_java",
-    ":private_key_types_java",
+    ":net_android_java_enums_srcjar",
     ":remote_android_keystore_aidl",
   ]
 }
@@ -51,33 +49,16 @@ java_cpp_template("net_errors_java") {
   ]
 }
 
-java_cpp_template("certificate_mime_types_java") {
-  package_name = "org/chromium/net"
-  sources = [
-    "java/CertificateMimeType.template",
-  ]
-  inputs = [
-    "../base/mime_util_certificate_type_list.h"
-  ]
-}
-
-java_cpp_template("cert_verify_status_android_java") {
-  package_name = "org/chromium/net"
+java_cpp_enum("net_android_java_enums_srcjar") {
   sources = [
-    "java/CertVerifyStatusAndroid.template",
+    "../base/mime_util.h",
+    "cert_verify_result_android.h",
+    "keystore.h"
   ]
-  inputs = [
-    "cert_verify_status_android_list.h"
-  ]
-}
-
-java_cpp_template("private_key_types_java") {
-  package_name = "org/chromium/net"
-  sources = [
-    "java/PrivateKeyType.template",
-  ]
-  inputs = [
-    "private_key_type_list.h"
+  outputs = [
+    "org/chromium/net/CertificateMimeType.java",
+    "org/chromium/net/CertVerifyStatusAndroid.java",
+    "org/chromium/net/PrivateKeyType.java",
   ]
 }
 

net/android/cert_verify_result_android.h

@@ -16,10 +16,28 @@ namespace net {
 
 namespace android {
 
+// The list of certificate verification results returned from Java side to the
+// C++ side.
+//
+// A Java counterpart will be generated for this enum.
+// GENERATED_JAVA_ENUM_PACKAGE: org.chromium.net
 enum CertVerifyStatusAndroid {
-#define CERT_VERIFY_STATUS_ANDROID(label, value) VERIFY_ ## label = value,
-#include "net/android/cert_verify_status_android_list.h"
-#undef CERT_VERIFY_STATUS_ANDROID
+  // Certificate is trusted.
+  CERT_VERIFY_STATUS_ANDROID_OK = 0,
+  // Certificate verification could not be conducted.
+  CERT_VERIFY_STATUS_ANDROID_FAILED = -1,
+  // Certificate is not trusted due to non-trusted root of the certificate
+  // chain.
+  CERT_VERIFY_STATUS_ANDROID_NO_TRUSTED_ROOT = -2,
+  // Certificate is not trusted because it has expired.
+  CERT_VERIFY_STATUS_ANDROID_EXPIRED = -3,
+  // Certificate is not trusted because it is not valid yet.
+  CERT_VERIFY_STATUS_ANDROID_NOT_YET_VALID = -4,
+  // Certificate is not trusted because it could not be parsed.
+  CERT_VERIFY_STATUS_ANDROID_UNABLE_TO_PARSE = -5,
+  // Certificate is not trusted because it has an extendedKeyUsage field, but
+  // its value is not correct for a web server.
+  CERT_VERIFY_STATUS_ANDROID_INCORRECT_KEY_USAGE = -6,
 };
 
 // Extract parameters out of an AndroidCertVerifyResult object.

net/android/cert_verify_status_android_list.h

-// Copyright 2014 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.
-
-// This file intentionally does not have header guards, it's included
-// inside a macro to generate enum values.
-
-// This file contains the list of certificate verification results returned
-// from Java side to the C++ side.
-
-// Certificate is trusted.
-CERT_VERIFY_STATUS_ANDROID(OK, 0)
-
-// Certificate verification could not be conducted.
-CERT_VERIFY_STATUS_ANDROID(FAILED, -1)
-
-// Certificate is not trusted due to non-trusted root of the certificate chain.
-CERT_VERIFY_STATUS_ANDROID(NO_TRUSTED_ROOT, -2)
-
-// Certificate is not trusted because it has expired.
-CERT_VERIFY_STATUS_ANDROID(EXPIRED, -3)
-
-// Certificate is not trusted because it is not valid yet.
-CERT_VERIFY_STATUS_ANDROID(NOT_YET_VALID, -4)
-
-// Certificate is not trusted because it could not be parsed.
-CERT_VERIFY_STATUS_ANDROID(UNABLE_TO_PARSE, -5)
-
-// Certificate is not trusted because it has an extendedKeyUsage field, but
-// its value is not correct for a web server.
-CERT_VERIFY_STATUS_ANDROID(INCORRECT_KEY_USAGE, -6)

net/android/java/CertVerifyStatusAndroid.template

-// Copyright 2014 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.
-
-package org.chromium.net;
-
-public class CertVerifyStatusAndroid {
-#define CERT_VERIFY_STATUS_ANDROID(name, value) public static final int VERIFY_##name = value;
-#include "net/android/cert_verify_status_android_list.h"
-}

net/android/java/CertificateMimeType.template

-// Copyright (c) 2012 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.
-
-package org.chromium.net;
-
-public class CertificateMimeType {
-#define CERTIFICATE_MIME_TYPE(name, value) public static final int name = value;
-#include "net/base/mime_util_certificate_type_list.h"
-#undef CERTIFICATE_MIME_TYPE
-}

net/android/java/PrivateKeyType.template

-// Copyright (c) 2013 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.
-
-package org.chromium.net;
-
-public class PrivateKeyType {
-#define DEFINE_PRIVATE_KEY_TYPE(name,value) public static final int name = value;
-#include "net/android/private_key_type_list.h"
-}

net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java

@@ -214,9 +214,9 @@ class AndroidNetworkLibrary {
         try {
             return X509Util.verifyServerCertificates(certChain, authType, host);
         } catch (KeyStoreException e) {
-            return new AndroidCertVerifyResult(CertVerifyStatusAndroid.VERIFY_FAILED);
+            return new AndroidCertVerifyResult(CertVerifyStatusAndroid.FAILED);
         } catch (NoSuchAlgorithmException e) {
-            return new AndroidCertVerifyResult(CertVerifyStatusAndroid.VERIFY_FAILED);
+            return new AndroidCertVerifyResult(CertVerifyStatusAndroid.FAILED);
         }
     }
 

net/android/java/src/org/chromium/net/X509Util.java

@@ -433,7 +433,7 @@ public class X509Util {
         try {
             ensureInitialized();
         } catch (CertificateException e) {
-            return new AndroidCertVerifyResult(CertVerifyStatusAndroid.VERIFY_FAILED);
+            return new AndroidCertVerifyResult(CertVerifyStatusAndroid.FAILED);
         }
 
         X509Certificate[] serverCertificates = new X509Certificate[certChain.length];
@@ -442,7 +442,7 @@ public class X509Util {
                 serverCertificates[i] = createCertificateFromBytes(certChain[i]);
             }
         } catch (CertificateException e) {
-            return new AndroidCertVerifyResult(CertVerifyStatusAndroid.VERIFY_UNABLE_TO_PARSE);
+            return new AndroidCertVerifyResult(CertVerifyStatusAndroid.UNABLE_TO_PARSE);
         }
 
         // Expired and not yet valid certificates would be rejected by the trust managers, but the
@@ -453,20 +453,20 @@ public class X509Util {
             serverCertificates[0].checkValidity();
             if (!verifyKeyUsage(serverCertificates[0])) {
                 return new AndroidCertVerifyResult(
-                        CertVerifyStatusAndroid.VERIFY_INCORRECT_KEY_USAGE);
+                        CertVerifyStatusAndroid.INCORRECT_KEY_USAGE);
             }
         } catch (CertificateExpiredException e) {
-            return new AndroidCertVerifyResult(CertVerifyStatusAndroid.VERIFY_EXPIRED);
+            return new AndroidCertVerifyResult(CertVerifyStatusAndroid.EXPIRED);
         } catch (CertificateNotYetValidException e) {
-            return new AndroidCertVerifyResult(CertVerifyStatusAndroid.VERIFY_NOT_YET_VALID);
+            return new AndroidCertVerifyResult(CertVerifyStatusAndroid.NOT_YET_VALID);
         } catch (CertificateException e) {
-            return new AndroidCertVerifyResult(CertVerifyStatusAndroid.VERIFY_FAILED);
+            return new AndroidCertVerifyResult(CertVerifyStatusAndroid.FAILED);
         }
 
         synchronized (sLock) {
             // If no trust manager was found, fail without crashing on the null pointer.
             if (sDefaultTrustManager == null)
-                return new AndroidCertVerifyResult(CertVerifyStatusAndroid.VERIFY_FAILED);
+                return new AndroidCertVerifyResult(CertVerifyStatusAndroid.FAILED);
 
             List<X509Certificate> verifiedChain;
             try {
@@ -482,7 +482,7 @@ public class X509Util {
                     Log.i(TAG, "Failed to validate the certificate chain, error: " +
                               eDefaultManager.getMessage());
                     return new AndroidCertVerifyResult(
-                            CertVerifyStatusAndroid.VERIFY_NO_TRUSTED_ROOT);
+                            CertVerifyStatusAndroid.NO_TRUSTED_ROOT);
                 }
             }
 
@@ -492,7 +492,7 @@ public class X509Util {
                 isIssuedByKnownRoot = isKnownRoot(root);
             }
 
-            return new AndroidCertVerifyResult(CertVerifyStatusAndroid.VERIFY_OK,
+            return new AndroidCertVerifyResult(CertVerifyStatusAndroid.OK,
                                                isIssuedByKnownRoot, verifiedChain);
         }
     }

net/android/keystore.h

@@ -26,10 +26,14 @@ struct AndroidEVP_PKEY;
 // Define a list of constants describing private key types. The
 // values are shared with Java through org.chromium.net.PrivateKeyType.
 // Example: PRIVATE_KEY_TYPE_RSA.
+//
+// A Java counterpart will be generated for this enum.
+// GENERATED_JAVA_ENUM_PACKAGE: org.chromium.net
 enum PrivateKeyType {
-#define DEFINE_PRIVATE_KEY_TYPE(name,value)  PRIVATE_KEY_TYPE_ ## name = value,
-#include "net/android/private_key_type_list.h"
-#undef DEFINE_PRIVATE_KEY_TYPE
+  PRIVATE_KEY_TYPE_RSA = 0,
+  PRIVATE_KEY_TYPE_DSA = 1,
+  PRIVATE_KEY_TYPE_ECDSA = 2,
+  PRIVATE_KEY_TYPE_INVALID = 255,
 };
 
 // Returns the modulus of a given RSAPrivateKey platform object,

net/android/private_key_type_list.h

-// Copyright (c) 2013 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 DEFINE_PRIVATE_KEY_TYPE
-#error "Please define DEFINE_PRIVATE_KEY_TYPE before including this file."
-#endif
-
-DEFINE_PRIVATE_KEY_TYPE(RSA, 0)
-DEFINE_PRIVATE_KEY_TYPE(DSA, 1)
-DEFINE_PRIVATE_KEY_TYPE(ECDSA, 2)
-DEFINE_PRIVATE_KEY_TYPE(INVALID, 255)

net/base/mime_util.h

@@ -147,10 +147,14 @@ NET_EXPORT void RemoveProprietaryMediaTypesAndCodecsForTests();
 NET_EXPORT const std::string GetIANAMediaType(const std::string& mime_type);
 
 // A list of supported certificate-related mime types.
+//
+// A Java counterpart will be generated for this enum.
+// GENERATED_JAVA_ENUM_PACKAGE: org.chromium.net
 enum CertificateMimeType {
-#define CERTIFICATE_MIME_TYPE(name, value) CERTIFICATE_MIME_TYPE_ ## name = value,
-#include "net/base/mime_util_certificate_type_list.h"
-#undef CERTIFICATE_MIME_TYPE
+  CERTIFICATE_MIME_TYPE_UNKNOWN,
+  CERTIFICATE_MIME_TYPE_X509_USER_CERT,
+  CERTIFICATE_MIME_TYPE_X509_CA_CERT,
+  CERTIFICATE_MIME_TYPE_PKCS12_ARCHIVE,
 };
 
 NET_EXPORT CertificateMimeType GetCertificateMimeTypeForMimeType(

net/base/mime_util_certificate_type_list.h

-// Copyright (c) 2012 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.
-
-// This file intentionally does not have header guards, it's included
-// inside a macro to generate enum values.
-
-// This file contains the list of certificate MIME types.
-
-CERTIFICATE_MIME_TYPE(UNKNOWN, 0)
-CERTIFICATE_MIME_TYPE(X509_USER_CERT, 1)
-CERTIFICATE_MIME_TYPE(X509_CA_CERT, 2)
-CERTIFICATE_MIME_TYPE(PKCS12_ARCHIVE, 3)

net/cert/cert_verify_proc_android.cc

@@ -38,21 +38,21 @@ bool VerifyFromAndroidTrustManager(const std::vector<std::string>& cert_bytes,
                                &status, &verify_result->is_issued_by_known_root,
                                &verified_chain);
   switch (status) {
-    case android::VERIFY_FAILED:
+    case android::CERT_VERIFY_STATUS_ANDROID_FAILED:
       return false;
-    case android::VERIFY_OK:
+    case android::CERT_VERIFY_STATUS_ANDROID_OK:
       break;
-    case android::VERIFY_NO_TRUSTED_ROOT:
+    case android::CERT_VERIFY_STATUS_ANDROID_NO_TRUSTED_ROOT:
       verify_result->cert_status |= CERT_STATUS_AUTHORITY_INVALID;
       break;
-    case android::VERIFY_EXPIRED:
-    case android::VERIFY_NOT_YET_VALID:
+    case android::CERT_VERIFY_STATUS_ANDROID_EXPIRED:
+    case android::CERT_VERIFY_STATUS_ANDROID_NOT_YET_VALID:
       verify_result->cert_status |= CERT_STATUS_DATE_INVALID;
       break;
-    case android::VERIFY_UNABLE_TO_PARSE:
+    case android::CERT_VERIFY_STATUS_ANDROID_UNABLE_TO_PARSE:
       verify_result->cert_status |= CERT_STATUS_INVALID;
       break;
-    case android::VERIFY_INCORRECT_KEY_USAGE:
+    case android::CERT_VERIFY_STATUS_ANDROID_INCORRECT_KEY_USAGE:
       verify_result->cert_status |= CERT_STATUS_INVALID;
       break;
     default:
@@ -85,7 +85,8 @@ bool VerifyFromAndroidTrustManager(const std::vector<std::string>& cert_bytes,
   // correct, as a full chain may have been constructed and then failed to
   // validate. However, if that is the case, the more serious error will
   // override any SHA-1 considerations.
-  size_t correction_for_root = (status == android::VERIFY_OK) ? 1 : 0;
+  size_t correction_for_root =
+      (status == android::CERT_VERIFY_STATUS_ANDROID_OK) ? 1 : 0;
   for (size_t i = 0; i < chain.size() - correction_for_root; ++i) {
     int sig_alg = OBJ_obj2nid(chain[i]->sig_alg->algorithm);
     if (sig_alg == NID_md2WithRSAEncryption) {

net/net.gyp

@@ -1620,38 +1620,26 @@
         {
           'target_name': 'certificate_mime_types_java',
           'type': 'none',
-          'sources': [
-            'android/java/CertificateMimeType.template',
-          ],
           'variables': {
-            'package_name': 'org/chromium/net',
-            'template_deps': ['base/mime_util_certificate_type_list.h'],
+            'source_file': 'base/mime_util.h',
           },
-          'includes': [ '../build/android/java_cpp_template.gypi' ],
+          'includes': [ '../build/android/java_cpp_enum.gypi' ],
         },
         {
           'target_name': 'cert_verify_status_android_java',
           'type': 'none',
-          'sources': [
-            'android/java/CertVerifyStatusAndroid.template',
-          ],
           'variables': {
-            'package_name': 'org/chromium/net',
-            'template_deps': ['android/cert_verify_status_android_list.h'],
+            'source_file': 'android/cert_verify_result_android.h',
           },
-          'includes': [ '../build/android/java_cpp_template.gypi' ],
+          'includes': [ '../build/android/java_cpp_enum.gypi' ],
         },
         {
           'target_name': 'private_key_types_java',
           'type': 'none',
-          'sources': [
-            'android/java/PrivateKeyType.template',
-          ],
           'variables': {
-            'package_name': 'org/chromium/net',
-            'template_deps': ['android/private_key_type_list.h'],
+            'source_file': 'android/keystore.h',
           },
-          'includes': [ '../build/android/java_cpp_template.gypi' ],
+          'includes': [ '../build/android/java_cpp_enum.gypi' ],
         },
         {
           'target_name': 'net_unittests_apk',