Update from https://crrev.com/308996

net/android/javatests/src/org/chromium/net/NetworkChangeNotifierTest.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.net;
 
 import android.content.Context;
 import android.content.Intent;
 import android.net.ConnectivityManager;
+import android.net.wifi.WifiManager;
 import android.telephony.TelephonyManager;
 import android.test.InstrumentationTestCase;
 import android.test.UiThreadTest;
 import android.test.suitebuilder.annotation.MediumTest;
 
 import org.chromium.base.ApplicationState;
 import org.chromium.base.library_loader.LibraryLoader;
 import org.chromium.base.test.util.Feature;
 import org.chromium.net.NetworkChangeNotifierAutoDetect.NetworkState;
 
@@ skipping 98 matching lines @@
         mConnectivityDelegate =
                 new MockConnectivityManagerDelegate();
         mConnectivityDelegate.setActiveNetworkExists(true);
         mReceiver.setConnectivityManagerDelegateForTests(mConnectivityDelegate);
 
         mWifiDelegate = new MockWifiManagerDelegate();
         mReceiver.setWifiManagerDelegateForTests(mWifiDelegate);
         mWifiDelegate.setWifiSSID("foo");
     }
 
+    private double getCurrentMaxBandwidthInMbps() {
+        final NetworkChangeNotifierAutoDetect.NetworkState networkState =
+                mReceiver.getCurrentNetworkState();
+        return mReceiver.getCurrentMaxBandwidthInMbps(networkState);
+    }
+
+    private int getCurrentConnectionType() {
+        final NetworkChangeNotifierAutoDetect.NetworkState networkState =
+                mReceiver.getCurrentNetworkState();
+        return mReceiver.getCurrentConnectionType(networkState);
+    }
+
+    /**
+     * Tests that changing the RSSI_CHANGED_ACTION intent updates MaxBandwidth.
+     */
+    @UiThreadTest
+    @MediumTest
+    @Feature({"Android-AppBase"})
+    public void testNetworkChangeNotifierRSSIEventUpdatesMaxBandwidthForWiFi()
+            throws InterruptedException {
+        NetworkChangeNotifier notifier = NetworkChangeNotifier.getInstance();
+        mConnectivityDelegate.setNetworkType(ConnectivityManager.TYPE_WIFI);
+        mWifiDelegate.setLinkSpeedInMbps(42);
+        Intent intent = new Intent(WifiManager.RSSI_CHANGED_ACTION);
+        mReceiver.onReceive(getInstrumentation().getTargetContext(), intent);
+
+        assertEquals(42.0, notifier.getCurrentMaxBandwidthInMbps());
+
+        // Changing the link speed has no effect until the intent fires.
+        mWifiDelegate.setLinkSpeedInMbps(80);
+        assertEquals(42.0, notifier.getCurrentMaxBandwidthInMbps());
+
+        // Fire the intent.
+        mReceiver.onReceive(getInstrumentation().getTargetContext(), intent);
+        assertEquals(80.0, notifier.getCurrentMaxBandwidthInMbps());
+
+        // Firing a network type change intent also causes max bandwidth to update.
+        mWifiDelegate.setLinkSpeedInMbps(20);
+        intent = new Intent(ConnectivityManager.CONNECTIVITY_ACTION);
+        mReceiver.onReceive(getInstrumentation().getTargetContext(), intent);
+        assertEquals(20.0, notifier.getCurrentMaxBandwidthInMbps());
+    }
+
     /**
      * Tests that changing the network type changes the maxBandwidth.
      */
     @UiThreadTest
     @MediumTest
     @Feature({"Android-AppBase"})
     public void testNetworkChangeNotifierMaxBandwidthEthernet() throws InterruptedException {
         // Show that for Ethernet the link speed is unknown (+Infinity).
         mConnectivityDelegate.setNetworkType(ConnectivityManager.TYPE_ETHERNET);
-        assertEquals(ConnectionType.CONNECTION_ETHERNET,
-                mReceiver.getCurrentConnectionType());
-        assertEquals(Double.POSITIVE_INFINITY, mReceiver.getCurrentMaxBandwidthInMbps());
+        assertEquals(ConnectionType.CONNECTION_ETHERNET, getCurrentConnectionType());
+        assertEquals(Double.POSITIVE_INFINITY, getCurrentMaxBandwidthInMbps());
     }
 
     @UiThreadTest
     @MediumTest
     @Feature({"Android-AppBase"})
     public void testNetworkChangeNotifierMaxBandwidthWifi() throws InterruptedException {
         // Test that for wifi types the link speed is read from the WifiManager.
         mWifiDelegate.setLinkSpeedInMbps(42);
         mConnectivityDelegate.setNetworkType(ConnectivityManager.TYPE_WIFI);
-        assertEquals(ConnectionType.CONNECTION_WIFI, mReceiver.getCurrentConnectionType());
-        assertEquals(42.0, mReceiver.getCurrentMaxBandwidthInMbps());
+        assertEquals(ConnectionType.CONNECTION_WIFI, getCurrentConnectionType());
+        assertEquals(42.0, getCurrentMaxBandwidthInMbps());
     }
 
     @UiThreadTest
     @MediumTest
     @Feature({"Android-AppBase"})
     public void testNetworkChangeNotifierMaxBandwidthWiMax() throws InterruptedException {
         // Show that for WiMax the link speed is unknown (+Infinity), although the type is 4g.
         // TODO(jkarlin): Add support for CONNECTION_WIMAX as specified in
         // http://w3c.github.io/netinfo/.
         mConnectivityDelegate.setNetworkType(ConnectivityManager.TYPE_WIMAX);
-        assertEquals(ConnectionType.CONNECTION_4G,
-                mReceiver.getCurrentConnectionType());
-        assertEquals(Double.POSITIVE_INFINITY, mReceiver.getCurrentMaxBandwidthInMbps());
+        assertEquals(ConnectionType.CONNECTION_4G, getCurrentConnectionType());
+        assertEquals(Double.POSITIVE_INFINITY, getCurrentMaxBandwidthInMbps());
     }
 
     @UiThreadTest
     @MediumTest
     @Feature({"Android-AppBase"})
     public void testNetworkChangeNotifierMaxBandwidthBluetooth() throws InterruptedException {
         // Show that for bluetooth the link speed is unknown (+Infinity).
         mConnectivityDelegate.setNetworkType(ConnectivityManager.TYPE_BLUETOOTH);
-        assertEquals(ConnectionType.CONNECTION_BLUETOOTH,
-                mReceiver.getCurrentConnectionType());
-        assertEquals(Double.POSITIVE_INFINITY, mReceiver.getCurrentMaxBandwidthInMbps());
+        assertEquals(ConnectionType.CONNECTION_BLUETOOTH, getCurrentConnectionType());
+        assertEquals(Double.POSITIVE_INFINITY, getCurrentMaxBandwidthInMbps());
     }
 
     @UiThreadTest
     @MediumTest
     @Feature({"Android-AppBase"})
     public void testNetworkChangeNotifierMaxBandwidthMobile() throws InterruptedException {
         // Test that for mobile types the subtype is used to determine the maxBandwidth.
         mConnectivityDelegate.setNetworkType(ConnectivityManager.TYPE_MOBILE);
         mConnectivityDelegate.setNetworkSubtype(TelephonyManager.NETWORK_TYPE_LTE);
-        assertEquals(ConnectionType.CONNECTION_4G, mReceiver.getCurrentConnectionType());
-        assertEquals(100.0, mReceiver.getCurrentMaxBandwidthInMbps());
+        assertEquals(ConnectionType.CONNECTION_4G, getCurrentConnectionType());
+        assertEquals(100.0, getCurrentMaxBandwidthInMbps());
     }
 
     /**
      * Tests that when Chrome gets an intent indicating a change in network connectivity, it sends a
      * notification to Java observers.
      */
     @UiThreadTest
     @MediumTest
     @Feature({"Android-AppBase"})
     public void testNetworkChangeNotifierJavaObservers() throws InterruptedException {
@@ skipping 37 matching lines @@
         // Change the state.
         mConnectivityDelegate.setActiveNetworkExists(true);
         mConnectivityDelegate.setNetworkType(ConnectivityManager.TYPE_WIFI);
         // The NetworkChangeNotifierAutoDetect doesn't receive any notification while we are in the
         // background, but when we get back to the foreground the state changed should be detected
         // and a notification sent.
         mReceiver.onApplicationStateChange(ApplicationState.HAS_RUNNING_ACTIVITIES);
         assertTrue(observer.hasReceivedNotification());
     }
 }