Don't initialize C++ constants in Java during JNI registration.

content/public/android/java/src/org/chromium/content_public/browser/LoadUrlParams.java

Index: content/public/android/java/src/org/chromium/content_public/browser/LoadUrlParams.java
diff --git a/content/public/android/java/src/org/chromium/content_public/browser/LoadUrlParams.java b/content/public/android/java/src/org/chromium/content_public/browser/LoadUrlParams.java
index 25a9f763a427faaee4872e83ca1af85ca6cf646f..482543118439b52cba6a6f1a0741ee2891bff087 100644
--- a/content/public/android/java/src/org/chromium/content_public/browser/LoadUrlParams.java
+++ b/content/public/android/java/src/org/chromium/content_public/browser/LoadUrlParams.java
@@ -4,8 +4,9 @@
 
 package org.chromium.content_public.browser;
 
-import org.chromium.base.CalledByNative;
 import org.chromium.base.JNINamespace;
+import org.chromium.content_public.browser.navigation_controller.LoadURLType;
+import org.chromium.content_public.browser.navigation_controller.UserAgentOverrideOption;
 import org.chromium.content_public.common.Referrer;
 import org.chromium.ui.base.PageTransition;
 
@@ -19,19 +20,11 @@ import java.util.Map;
  */
 @JNINamespace("content")
 public class LoadUrlParams {
-    // Should match NavigationController::LoadUrlType exactly. See comments
-    // there for proper usage. initializeConstants() checks that the values
-    // are correct.
-    public static final int LOAD_TYPE_DEFAULT = 0;
-    public static final int LOAD_TYPE_BROWSER_INITIATED_HTTP_POST = 1;
-    public static final int LOAD_TYPE_DATA = 2;
-
-    // Should match NavigationController::UserAgentOverrideOption exactly.
-    // See comments there for proper usage. initializeConstants() checks that
-    // the values are correct.
-    public static final int UA_OVERRIDE_INHERIT = 0;
-    public static final int UA_OVERRIDE_FALSE = 1;
-    public static final int UA_OVERRIDE_TRUE = 2;
+    // These fields have been replaced by build-time generated enums and should be removed when
+    // no longer used downstream.
+    @Deprecated
+    public static final int LOAD_TYPE_BROWSER_INITIATED_HTTP_POST =
+            LoadURLType.BROWSER_INITIATED_HTTP_POST;
 
     // Fields with counterparts in NavigationController::LoadURLParams.
     // Package private so that ContentViewCore.loadUrl can pass them down to
@@ -69,8 +62,8 @@ public class LoadUrlParams {
 
         // Initialize other fields to defaults matching defaults of the native
         // NavigationController::LoadUrlParams.
-        mLoadUrlType = LOAD_TYPE_DEFAULT;
-        mUaOverrideOption = UA_OVERRIDE_INHERIT;
+        mLoadUrlType = LoadURLType.DEFAULT;
+        mUaOverrideOption = UserAgentOverrideOption.INHERIT;
         mPostData = null;
         mBaseUrlForDataUrl = null;
         mVirtualUrlForDataUrl = null;
@@ -109,7 +102,7 @@ public class LoadUrlParams {
         dataUrl.append(data);
 
         LoadUrlParams params = new LoadUrlParams(dataUrl.toString());
-        params.setLoadType(LoadUrlParams.LOAD_TYPE_DATA);
+        params.setLoadType(LoadURLType.DATA);
         params.setTransitionType(PageTransition.TYPED);
         return params;
     }
@@ -173,7 +166,7 @@ public class LoadUrlParams {
     public static LoadUrlParams createLoadHttpPostParams(
             String url, byte[] postData) {
         LoadUrlParams params = new LoadUrlParams(url);
-        params.setLoadType(LOAD_TYPE_BROWSER_INITIATED_HTTP_POST);
+        params.setLoadType(LoadURLType.BROWSER_INITIATED_HTTP_POST);
         params.setTransitionType(PageTransition.TYPED);
         params.setPostData(postData);
         return params;
@@ -201,7 +194,7 @@ public class LoadUrlParams {
     }
 
     /**
-     * Set load type of this load. Defaults to LOAD_TYPE_DEFAULT.
+     * Set load type of this load. Defaults to LoadURLType.DEFAULT.
      * @param loadType One of LOAD_TYPE static constants above.
      */
     public void setLoadType(int loadType) {
@@ -307,7 +300,7 @@ public class LoadUrlParams {
     }
 
     /**
-     * Set user agent override option of this load. Defaults to UA_OVERRIDE_INHERIT.
+     * Set user agent override option of this load. Defaults to UserAgentOverrideOption.INHERIT.
      * @param uaOption One of UA_OVERRIDE static constants above.
      */
     public void setOverrideUserAgent(int uaOption) {
@@ -315,7 +308,7 @@ public class LoadUrlParams {
     }
 
     /**
-     * Get user agent override option of this load. Defaults to UA_OVERRIDE_INHERIT.
+     * Get user agent override option of this load. Defaults to UserAgentOverrideOption.INHERIT.
      * @param uaOption One of UA_OVERRIDE static constants above.
      */
     public int getUserAgentOverrideOption() {
@@ -324,7 +317,7 @@ public class LoadUrlParams {
 
     /**
      * Set the post data of this load. This field is ignored unless load type is
-     * LOAD_TYPE_BROWSER_INITIATED_HTTP_POST.
+     * LoadURLType.BROWSER_INITIATED_HTTP_POST.
      * @param postData Post data for this http post load.
      */
     public void setPostData(byte[] postData) {
@@ -341,7 +334,7 @@ public class LoadUrlParams {
     /**
      * Set the base url for data load. It is used both to resolve relative URLs
      * and when applying JavaScript's same origin policy. It is ignored unless
-     * load type is LOAD_TYPE_DATA.
+     * load type is LoadURLType.DATA.
      * @param baseUrl The base url for this data load.
      */
     public void setBaseUrlForDataUrl(String baseUrl) {
@@ -350,7 +343,7 @@ public class LoadUrlParams {
 
     /**
      * Get the virtual url for data load. It is the url displayed to the user.
-     * It is ignored unless load type is LOAD_TYPE_DATA.
+     * It is ignored unless load type is LoadURLType.DATA.
      * @return The virtual url for this data load.
      */
     public String getVirtualUrlForDataUrl() {
@@ -359,7 +352,7 @@ public class LoadUrlParams {
 
     /**
      * Set the virtual url for data load. It is the url displayed to the user.
-     * It is ignored unless load type is LOAD_TYPE_DATA.
+     * It is ignored unless load type is LoadURLType.DATA.
      * @param virtualUrl The virtual url for this data load.
      */
     public void setVirtualUrlForDataUrl(String virtualUrl) {
@@ -403,29 +396,12 @@ public class LoadUrlParams {
     public boolean isBaseUrlDataScheme() {
         // If there's no base url set, but this is a data load then
         // treat the scheme as data:.
-        if (mBaseUrlForDataUrl == null && mLoadUrlType == LOAD_TYPE_DATA) {
+        if (mBaseUrlForDataUrl == null && mLoadUrlType == LoadURLType.DATA) {
             return true;
         }
         return nativeIsDataScheme(mBaseUrlForDataUrl);
     }
 
-    @SuppressWarnings("unused")
-    @CalledByNative
-    private static void initializeConstants(
-            int loadTypeDefault,
-            int loadTypeBrowserInitiatedHttpPost,
-            int loadTypeData,
-            int uaOverrideInherit,
-            int uaOverrideFalse,
-            int uaOverrideTrue) {
-        assert LOAD_TYPE_DEFAULT == loadTypeDefault;
-        assert LOAD_TYPE_BROWSER_INITIATED_HTTP_POST == loadTypeBrowserInitiatedHttpPost;
-        assert LOAD_TYPE_DATA == loadTypeData;
-        assert UA_OVERRIDE_INHERIT == uaOverrideInherit;
-        assert UA_OVERRIDE_FALSE == uaOverrideFalse;
-        assert UA_OVERRIDE_TRUE == uaOverrideTrue;
-    }
-
     /**
      * Parses |url| as a GURL on the native side, and
      * returns true if it's scheme is data:.