Final step of the java_cpp_template -> java_cpp_enum migration.

components/cronet/android/chromium_url_request.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.
 
 #ifndef COMPONENTS_CRONET_ANDROID_CHROMIUM_URL_REQUEST_H_
 #define COMPONENTS_CRONET_ANDROID_CHROMIUM_URL_REQUEST_H_
 
 #include <jni.h>
 
 namespace cronet {
 
 // Define request priority values like REQUEST_PRIORITY_IDLE in a
 // way that ensures they're always the same than their Java counterpart.
 enum UrlRequestPriority {
-#define DEFINE_REQUEST_PRIORITY(x, y) REQUEST_PRIORITY_##x = y,
-#include "components/cronet/android/chromium_url_request_priority_list.h"
-#undef DEFINE_REQUEST_PRIORITY
+  REQUEST_PRIORITY_IDLE = 0,
+  REQUEST_PRIORITY_LOWEST = 1,
+  REQUEST_PRIORITY_LOW = 2,
+  REQUEST_PRIORITY_MEDIUM = 3,
+  REQUEST_PRIORITY_HIGHEST = 4,
 };
 
 // Define request priority values like REQUEST_ERROR_SUCCESS in a
 // way that ensures they're always the same than their Java counterpart.
 enum UrlRequestError {

[mmenke, 2014/10/15 13:33:11]

You presumably need to update the java files that actually used these as well.

See ChromiumUrlRequestError and ChromiumUrlRequestPriority in
components/cronet/android/java/src/org/chromium/net/ChromiumUrlRequest.java

[mkosiba (inactive), 2014/10/16 12:45:07]

I'll just instruct the generator to generate the enum with a different name.

-#define DEFINE_REQUEST_ERROR(x, y) REQUEST_ERROR_##x = y,
-#include "components/cronet/android/chromium_url_request_error_list.h"
-#undef DEFINE_REQUEST_ERROR
+  REQUEST_ERROR_SUCCESS = 1,

[mmenke, 2014/10/15 13:33:12]

BUG:  Success should be 0.

[mkosiba (inactive), 2014/10/16 12:45:07]

Fixed.  Didn't realize I wasn't compiling cronet, so my 'diff generated files'
verification strategy didn't work here :/

+  REQUEST_ERROR_UNKNOWN = 1,
+  REQUEST_ERROR_MALFORMED_URL = 2,
+  REQUEST_ERROR_CONNECTION_TIMED_OUT = 3,
+  REQUEST_ERROR_UNKNOWN_HOST = 4,
 };
 
 bool ChromiumUrlRequestRegisterJni(JNIEnv* env);
 
 }  // namespace cronet
 
 #endif  // COMPONENTS_CRONET_ANDROID_CHROMIUM_URL_REQUEST_H_