[Cronet] Add callback wrapper classes to enforce API version checking.

components/cronet/android/java/src/org/chromium/net/impl/CronetUrlRequest.java

Index: components/cronet/android/java/src/org/chromium/net/impl/CronetUrlRequest.java
diff --git a/components/cronet/android/java/src/org/chromium/net/impl/CronetUrlRequest.java b/components/cronet/android/java/src/org/chromium/net/impl/CronetUrlRequest.java
index 1f19d5a17d2fe9be7c3e8525040999a56e9e8fa1..4ac959a6e2adf82fd0e9190f311a61e321671f5c 100644
--- a/components/cronet/android/java/src/org/chromium/net/impl/CronetUrlRequest.java
+++ b/components/cronet/android/java/src/org/chromium/net/impl/CronetUrlRequest.java
@@ -17,6 +17,8 @@ import org.chromium.net.RequestPriority;
 import org.chromium.net.UploadDataProvider;
 import org.chromium.net.UrlRequest;
 import org.chromium.net.UrlRequestException;
+// JNI generator requires this; unfortunately CL upload checks disallow it so they must be bypassed.
+import org.chromium.net.impl.VersionSafeCallbacks;
 
 import java.nio.ByteBuffer;
 import java.util.AbstractMap;
@@ -74,7 +76,7 @@ public final class CronetUrlRequest extends UrlRequestBase {
     private final List<String> mUrlChain = new ArrayList<String>();
     private long mReceivedBytesCountFromRedirects;
 
-    private final UrlRequest.Callback mCallback;
+    private final VersionSafeCallbacks.UrlRequestCallback mCallback;
     private final String mInitialUrl;
     private final int mPriority;
     private String mInitialMethod;
@@ -143,7 +145,7 @@ public final class CronetUrlRequest extends UrlRequestBase {
         mInitialUrl = url;
         mUrlChain.add(url);
         mPriority = convertRequestPriority(priority);
-        mCallback = callback;
+        mCallback = new VersionSafeCallbacks.UrlRequestCallback(callback);
         mExecutor = executor;
         mRequestAnnotations = requestAnnotations;
         mDisableCache = disableCache;
@@ -314,7 +316,9 @@ public final class CronetUrlRequest extends UrlRequestBase {
     }
 
     @Override
-    public void getStatus(final UrlRequest.StatusListener listener) {
+    public void getStatus(UrlRequest.StatusListener unsafeListener) {
+        final VersionSafeCallbacks.UrlRequestStatusListener listener =
+                new VersionSafeCallbacks.UrlRequestStatusListener(unsafeListener);
         synchronized (mUrlRequestAdapterLock) {
             if (mUrlRequestAdapter != 0) {
                 nativeGetStatus(mUrlRequestAdapter, listener);
@@ -675,7 +679,8 @@ public final class CronetUrlRequest extends UrlRequestBase {
      */
     @SuppressWarnings("unused")
     @CalledByNative
-    private void onStatus(final UrlRequest.StatusListener listener, final int loadState) {
+    private void onStatus(
+            final VersionSafeCallbacks.UrlRequestStatusListener listener, final int loadState) {
         Runnable task = new Runnable() {
             @Override
             public void run() {
@@ -777,5 +782,6 @@ public final class CronetUrlRequest extends UrlRequestBase {
     private native void nativeDestroy(long nativePtr, boolean sendOnCanceled);
 
     @NativeClassQualifiedName("CronetURLRequestAdapter")
-    private native void nativeGetStatus(long nativePtr, UrlRequest.StatusListener listener);
+    private native void nativeGetStatus(
+            long nativePtr, VersionSafeCallbacks.UrlRequestStatusListener listener);
 }