Android: moves net/ to use long for JNI.

BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234285 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 18 insertions, 19 deletions

diff --git a/net/android/java/src/org/chromium/net/NetworkChangeNotifier.java b/net/android/java/src/org/chromium/net/NetworkChangeNotifier.java
index 9de8c5c..6ea1ec0 100644
--- a/net/android/java/src/org/chromium/net/NetworkChangeNotifier.java
+++ b/net/android/java/src/org/chromium/net/NetworkChangeNotifier.java
@@ -43,7 +43,7 @@ public class NetworkChangeNotifier {
     public static final int CONNECTION_NONE = 6;
 
     private final Context mContext;
-    private final ArrayList<Integer> mNativeChangeNotifiers;
+    private final ArrayList<Long> mNativeChangeNotifiers;
     private final ObserverList<ConnectionTypeObserver> mConnectionTypeObservers;
     private NetworkChangeNotifierAutoDetect mAutoDetector;
     private int mCurrentConnectionType = CONNECTION_UNKNOWN;
@@ -52,7 +52,7 @@ public class NetworkChangeNotifier {
 
     private NetworkChangeNotifier(Context context) {
         mContext = context.getApplicationContext();
-        mNativeChangeNotifiers = new ArrayList<Integer>();
+        mNativeChangeNotifiers = new ArrayList<Long>();
         mConnectionTypeObservers = new ObserverList<ConnectionTypeObserver>();
     }
 
@@ -84,7 +84,7 @@ public class NetworkChangeNotifier {
      * Adds a native-side observer.
      */
     @CalledByNative
-    public void addNativeObserver(int nativeChangeNotifier) {
+    public void addNativeObserver(long nativeChangeNotifier) {
         mNativeChangeNotifiers.add(nativeChangeNotifier);
     }
 
@@ -92,10 +92,8 @@ public class NetworkChangeNotifier {
      * Removes a native-side observer.
      */
     @CalledByNative
-    public void removeNativeObserver(int nativeChangeNotifier) {
-        // Please keep the cast performing the boxing below. It ensures that the right method
-        // overload is used. ArrayList<T> has both remove(int index) and remove(T element).
-        mNativeChangeNotifiers.remove((Integer) nativeChangeNotifier);
+    public void removeNativeObserver(long nativeChangeNotifier) {
+        mNativeChangeNotifiers.remove(nativeChangeNotifier);
     }
 
     /**
@@ -171,7 +169,7 @@ public class NetworkChangeNotifier {
      * Alerts all observers of a connection change.
      */
     void notifyObserversOfConnectionTypeChange(int newConnectionType) {
-        for (Integer nativeChangeNotifier : mNativeChangeNotifiers) {
+        for (Long nativeChangeNotifier : mNativeChangeNotifiers) {
             nativeNotifyConnectionTypeChanged(nativeChangeNotifier, newConnectionType);
         }
         for (ConnectionTypeObserver observer : mConnectionTypeObservers) {
@@ -204,10 +202,7 @@ public class NetworkChangeNotifier {
     }
 
     @NativeClassQualifiedName("NetworkChangeNotifierDelegateAndroid")
-    private native void nativeNotifyConnectionTypeChanged(int nativePtr, int newConnectionType);
-
-    @NativeClassQualifiedName("NetworkChangeNotifierDelegateAndroid")
-    private native int nativeGetConnectionType(int nativePtr);
+    private native void nativeNotifyConnectionTypeChanged(long nativePtr, int newConnectionType);
 
     // For testing only.
     public static NetworkChangeNotifierAutoDetect getAutoDetectorForTest() {
diff --git a/net/android/java/src/org/chromium/net/ProxyChangeListener.java b/net/android/java/src/org/chromium/net/ProxyChangeListener.java
index ce9aabb..879d504 100644
--- a/net/android/java/src/org/chromium/net/ProxyChangeListener.java
+++ b/net/android/java/src/org/chromium/net/ProxyChangeListener.java
@@ -24,7 +24,7 @@ public class ProxyChangeListener {
     private static final String TAG = "ProxyChangeListener";
     private static boolean sEnabled = true;
 
-    private int mNativePtr;
+    private long mNativePtr;
     private Context mContext;
     private ProxyReceiver mProxyReceiver;
     private Delegate mDelegate;
@@ -65,7 +65,7 @@ public class ProxyChangeListener {
     }
 
     @CalledByNative
-    public void start(int nativePtr) {
+    public void start(long nativePtr) {
         assert mNativePtr == 0;
         mNativePtr = nativePtr;
         registerReceiver();
@@ -164,9 +164,9 @@ public class ProxyChangeListener {
      * See net/proxy/proxy_config_service_android.cc
      */
     @NativeClassQualifiedName("ProxyConfigServiceAndroid::JNIDelegate")
-    private native void nativeProxySettingsChangedTo(int nativePtr,
+    private native void nativeProxySettingsChangedTo(long nativePtr,
                                                      String host,
                                                      int port);
     @NativeClassQualifiedName("ProxyConfigServiceAndroid::JNIDelegate")
-    private native void nativeProxySettingsChanged(int nativePtr);
+    private native void nativeProxySettingsChanged(long nativePtr);
 }
diff --git a/net/android/network_change_notifier_delegate_android.cc b/net/android/network_change_notifier_delegate_android.cc
index 0031260..207f01b 100644
--- a/net/android/network_change_notifier_delegate_android.cc
+++ b/net/android/network_change_notifier_delegate_android.cc
@@ -40,7 +40,8 @@ NetworkChangeNotifierDelegateAndroid::NetworkChangeNotifierDelegateAndroid()
       Java_NetworkChangeNotifier_init(
           env, base::android::GetApplicationContext()));
   Java_NetworkChangeNotifier_addNativeObserver(
-      env, java_network_change_notifier_.obj(), reinterpret_cast<jint>(this));
+      env, java_network_change_notifier_.obj(),
+      reinterpret_cast<intptr_t>(this));
   SetCurrentConnectionType(
       ConvertConnectionType(
           Java_NetworkChangeNotifier_getCurrentConnectionType(
@@ -52,7 +53,8 @@ NetworkChangeNotifierDelegateAndroid::~NetworkChangeNotifierDelegateAndroid() {
   observers_->AssertEmpty();
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_NetworkChangeNotifier_removeNativeObserver(
-      env, java_network_change_notifier_.obj(), reinterpret_cast<jint>(this));
+      env, java_network_change_notifier_.obj(),
+      reinterpret_cast<intptr_t>(this));
 }
 
 NetworkChangeNotifier::ConnectionType
diff --git a/net/net.gyp b/net/net.gyp
index 17594b8..2cd7cd1 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -2872,6 +2872,7 @@
           ],
           'variables': {
             'jni_gen_package': 'net',
+            'jni_generator_ptr_type': 'long',
           },
           'direct_dependent_settings': {
             'include_dirs': [
@@ -2888,6 +2889,7 @@
           ],
           'variables': {
             'jni_gen_package': 'net',
+            'jni_generator_ptr_type': 'long',
           },
           'direct_dependent_settings': {
             'include_dirs': [
diff --git a/net/proxy/proxy_config_service_android.cc b/net/proxy/proxy_config_service_android.cc
index 23a42060..088621d 100644
--- a/net/proxy/proxy_config_service_android.cc
+++ b/net/proxy/proxy_config_service_android.cc
@@ -196,7 +196,7 @@ class ProxyConfigServiceAndroid::Delegate
     Java_ProxyChangeListener_start(
         env,
         java_proxy_change_listener_.obj(),
-        reinterpret_cast<jint>(&jni_delegate_));
+        reinterpret_cast<intptr_t>(&jni_delegate_));
   }
 
   void FetchInitialConfig() {