Optimize NetworkChangeNotifierAutoDetect construction

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 static android.net.NetworkCapabilities.NET_CAPABILITY_INTERNET;
 import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR;
 import static android.net.NetworkCapabilities.TRANSPORT_VPN;
 import static android.net.NetworkCapabilities.TRANSPORT_WIFI;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
 import android.net.ConnectivityManager;
 import android.net.ConnectivityManager.NetworkCallback;
 import android.net.Network;
 import android.net.NetworkCapabilities;
 import android.net.NetworkRequest;
+import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
 import android.os.Build;
 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.ThreadUtils;
 import org.chromium.base.library_loader.LibraryLoader;
@@ skipping 224 matching lines @@
 
     /**
      * Mocks out calls to the WifiManager.
      */
     private static class MockWifiManagerDelegate
             extends NetworkChangeNotifierAutoDetect.WifiManagerDelegate {
         private String mWifiSSID;
         private int mLinkSpeedMbps;
 
         @Override
-        public String getWifiSSID() {
+        public String getWifiSSID(WifiInfo wifiInfo) {
             return mWifiSSID;
         }
 
         public void setWifiSSID(String wifiSSID) {
             mWifiSSID = wifiSSID;
         }
 
         @Override
-        public int getLinkSpeedInMbps() {
+        public int getLinkSpeedInMbps(WifiInfo wifiInfo) {
             return mLinkSpeedMbps;
         }
 
         public void setLinkSpeedInMbps(int linkSpeedInMbps) {
             mLinkSpeedMbps = linkSpeedInMbps;
         }
     }
 
     private static int demungeNetId(long netId) {
         // On Marshmallow, demunge the NetID to undo munging done in Network.getNetworkHandle().
@@ skipping 663 matching lines @@
             mConnectivityDelegate.setActiveNetworkExists(true);
             mConnectivityDelegate.setNetworkType(i);
             mReceiver.onReceive(getInstrumentation().getTargetContext(), intent);
             assertTrue(NetworkChangeNotifier.isOnline());
         }
         mConnectivityDelegate.setActiveNetworkExists(false);
         mReceiver.onReceive(getInstrumentation().getTargetContext(), intent);
         assertFalse(NetworkChangeNotifier.isOnline());
     }
 }