Make NetworkChangeNotifier.isOnline() return true for UNKNOWN connect…

…ion type.

CONNECTION_UNKNOWN still means the device is online so it should return true
for isOnline().

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

Cr-Commit-Position: refs/heads/master@{#370399}

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

@@ -415,7 +415,6 @@ public static NetworkChangeNotifierAutoDetect getAutoDetectorForTest() {
      */
     public static boolean isOnline() {
         int connectionType = getInstance().getCurrentConnectionType();
-        return connectionType != ConnectionType.CONNECTION_UNKNOWN
-                && connectionType != ConnectionType.CONNECTION_NONE;
+        return connectionType != ConnectionType.CONNECTION_NONE;
     }
 }

net/android/javatests/src/org/chromium/net/NetworkChangeNotifierTest.java

@@ -675,4 +675,25 @@ int getApplicationState() {
         // Verify network list purged.
         observer.assertLastChange(ChangeType.PURGE_LIST, NetId.INVALID);
     }
+
+    /**
+     * Tests that isOnline() returns the correct result.
+     */
+    @UiThreadTest
+    @MediumTest
+    @Feature({"Android-AppBase"})
+    public void testNetworkChangeNotifierIsOnline() throws InterruptedException {
+        NetworkChangeNotifier notifier = NetworkChangeNotifier.getInstance();
+        Intent intent = new Intent(ConnectivityManager.CONNECTIVITY_ACTION);
+        // For any connection type it should return true.
+        for (int i = ConnectivityManager.TYPE_MOBILE; i < ConnectivityManager.TYPE_VPN; i++) {
+            mConnectivityDelegate.setActiveNetworkExists(true);
+            mConnectivityDelegate.setNetworkType(i);
+            mReceiver.onReceive(getInstrumentation().getTargetContext(), intent);
+            assertTrue(notifier.isOnline());
+        }
+        mConnectivityDelegate.setActiveNetworkExists(false);
+        mReceiver.onReceive(getInstrumentation().getTargetContext(), intent);
+        assertFalse(notifier.isOnline());
+    }
 }