Add native-side unit test for Android NetworkChangeNotifier

net/android/java/src/org/chromium/net/NetworkChangeNotifier.java

 // Copyright (c) 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.net;
 
 import android.content.Context;
 
 import org.chromium.base.CalledByNative;
 import org.chromium.base.JNINamespace;
@@ skipping 24 matching lines @@
     private NetworkChangeNotifierAutoDetect mAutoDetector;
 
     private static NetworkChangeNotifier sInstance;
 
     // Private constructor - instances are only created via the create factory
     // function, which is only called from native.
     private NetworkChangeNotifier(Context context, int nativeChangeNotifier) {
         mContext = context;
         mNativeChangeNotifier = nativeChangeNotifier;
         mConnectionType = CONNECTION_UNKNOWN;
-        sInstance = this;
+    }
+
+    private void destroy() {
+        if (mAutoDetector != null) {
+            mAutoDetector.destroy();
+        }
+        mNativeChangeNotifier = 0;
     }
 
     /**
+     * Creates the singleton used by the native-side NetworkChangeNotifier.
+     */
+    @CalledByNative
+    static NetworkChangeNotifier createInstance(Context context, int nativeChangeNotifier) {
+        assert sInstance == null;
+        sInstance = new NetworkChangeNotifier(context, nativeChangeNotifier);
+        return sInstance;
+    }
+
+    /**
+     * Destroys the singleton used by the native-side NetworkChangeNotifier.
+     */
+    @CalledByNative
+    private static void destroyInstance() {
+        assert sInstance != null;
+        sInstance.destroy();
+        sInstance = null;
+    }
+
+    /**
+     * Returns the instance used by the native-side NetworkChangeNotifier.
+     */
+    public static NetworkChangeNotifier getInstance() {
+        assert sInstance != null;
+        return sInstance;
+    }
+
+    /**
      * Enable auto detection of the current network state based on notifications
      * from the system. Note that passing true here requires the embedding app
      * have the platform ACCESS_NETWORK_STATE permission.
      *
      * @param shouldAutoDetect true if the NetworkChangeNotifier should listen
      *     for system changes in network connectivity.
      */
     public static void setAutoDetectConnectivityState(boolean shouldAutoDetect) {
         // We should only get a call to this after the native object is created and
         // hence the singleton initialised.
@@ skipping 14 matching lines @@
         }
     }
 
     /**
      * Update the perceived network state when not auto-detecting
      * changes to connectivity.
      *
      * @param networkAvailable True if the NetworkChangeNotifier should
      *     perceive a "connected" state, false implies "disconnected".
      */
+    @CalledByNative
     public static void forceConnectivityState(boolean networkAvailable) {
         assert sInstance != null;
         setAutoDetectConnectivityState(false);
         sInstance.forceConnectivityStateInternal(networkAvailable);
     }
 
     private void forceConnectivityStateInternal(boolean forceOnline) {
         boolean connectionCurrentlyExists = mConnectionType != CONNECTION_NONE;
         if (connectionCurrentlyExists != forceOnline) {
             mConnectionType = forceOnline ? CONNECTION_UNKNOWN : CONNECTION_NONE;
-            notifyNativeObservers();
+            notifyObserversOfConnectionTypeChange();
         }
     }
 
-    void notifyNativeObservers() {
+    void notifyObserversOfConnectionTypeChange() {
         if (mNativeChangeNotifier != 0) {
-            nativeNotifyObservers(mNativeChangeNotifier);
+            nativeNotifyObserversOfConnectionTypeChange(mNativeChangeNotifier);
         }
     }
 
     @CalledByNative
     private int connectionType() {
         if (mAutoDetector != null) {
             return mAutoDetector.connectionType();
         }
         return mConnectionType;
     }
 
-    @CalledByNative
-    private void destroy() {
-        if (mAutoDetector != null) {
-            mAutoDetector.destroy();
-        }
-        mNativeChangeNotifier = 0;
-        sInstance = null;
-    }
-
-    @CalledByNative
-    private static NetworkChangeNotifier create(Context context, int nativeNetworkChangeNotifier) {
-        return new NetworkChangeNotifier(context, nativeNetworkChangeNotifier);
-    }
-
-    @NativeClassQualifiedName("android::NetworkChangeNotifier")
-    private native void nativeNotifyObservers(int nativePtr);
+    @NativeClassQualifiedName("NetworkChangeNotifierAndroid")
+    private native void nativeNotifyObserversOfConnectionTypeChange(int nativePtr);
 
     // For testing only.
     public static NetworkChangeNotifierAutoDetect getAutoDetectorForTest() {
+        assert sInstance != null;
         return sInstance.mAutoDetector;
     }
 }