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

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

 // Copyright 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.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;
 
 import java.util.Locale;
 import java.util.Map;
 
 /**
  * Holds parameters for NavigationController.LoadUrl. Parameters should match
  * counterparts in NavigationController::LoadURLParams, including default
  * values.
  */
 @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
     // native code. Should not be accessed directly anywhere else outside of
     // this class.
     String mUrl;
     int mLoadUrlType;
     int mTransitionType;
     Referrer mReferrer;
     private Map<String, String> mExtraHeaders;
@@ skipping 17 matching lines @@
      * Creates an instance with the given page transition type.
      * @param url the url to be loaded
      * @param transitionType the PageTransitionType constant corresponding to the load
      */
     public LoadUrlParams(String url, int transitionType) {
         mUrl = url;
         mTransitionType = transitionType;
 
         // 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;
     }
 
     /**
      * Helper method to create a LoadUrlParams object for data url.
      * @param data Data to be loaded.
      * @param mimeType Mime type of the data.
      * @param isBase64Encoded True if the data is encoded in Base 64 format.
@@ skipping 18 matching lines @@
         if (charset != null && !charset.isEmpty()) {
             dataUrl.append(";charset=" + charset);
         }
         if (isBase64Encoded) {
             dataUrl.append(";base64");
         }
         dataUrl.append(",");
         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;
     }
 
     /**
      * Helper method to create a LoadUrlParams object for data url with base
      * and virtual url.
      * @param data Data to be loaded.
      * @param mimeType Mime type of the data.
      * @param isBase64Encoded True if the data is encoded in Base 64 format.
@@ skipping 43 matching lines @@
     }
 
     /**
      * Helper method to create a LoadUrlParams object for an HTTP POST load.
      * @param url URL of the load.
      * @param postData Post data of the load. Can be null.
      */
     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;
     }
 
     /**
      * Sets the url.
      */
     public void setUrl(String url) {
         mUrl = url;
     }
 
     /**
      * Return the url.
      */
     public String getUrl() {
         return mUrl;
     }
 
     /**
      * Return the base url for a data url, otherwise null.
      */
     public String getBaseUrl() {
         return mBaseUrlForDataUrl;
     }
 
     /**
-     * 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) {
         mLoadUrlType = loadType;
     }
 
     /**
      * Set transition type of this load. Defaults to PageTransition.LINK.
      * @param transitionType One of PAGE_TRANSITION static constants in ContentView.
      */
@@ skipping 85 matching lines @@
     }
 
     /**
      * @return the verbatim extra headers string
      */
     public String getVerbatimHeaders() {
         return mVerbatimHeaders;
     }
 
     /**
-     * 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) {
         mUaOverrideOption = uaOption;
     }
 
     /**
-     * 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() {
         return mUaOverrideOption;
     }
 
     /**
      * 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) {
         mPostData = postData;
     }
 
     /**
      * @return the data to be sent through POST
      */
     public byte[] getPostData() {
         return mPostData;
     }
 
     /**
      * 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) {
         mBaseUrlForDataUrl = baseUrl;
     }
 
     /**
      * 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() {
         return mVirtualUrlForDataUrl;
     }
 
     /**
      * 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) {
         mVirtualUrlForDataUrl = virtualUrl;
     }
 
     /**
      * Set whether the load should be able to access local resources. This
      * defaults to false.
      */
@@ skipping 23 matching lines @@
     /**
      * @return Whether or not this load was initiated from a renderer or not.
      */
     public boolean getIsRendererInitiated() {
         return mIsRendererInitiated;
     }
 
     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:.
      */
     private static native boolean nativeIsDataScheme(String url);
 }