Fix issues with NetworkMonitor singleton when used by multiple clients.

webrtc/sdk/android/instrumentationtests/src/org/webrtc/NetworkMonitorTest.java

 /*
  *  Copyright 2015 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 23 matching lines @@
 import android.support.test.filters.SmallTest;
 import android.support.test.rule.UiThreadTestRule;
 import org.chromium.base.test.BaseJUnit4ClassRunner;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 /**
  * Tests for org.webrtc.NetworkMonitor.
+ *
+ * TODO(deadbeef): These tests don't cover the interaction between
+ * NetworkManager.java and androidnetworkmonitor_jni.cc, which is how this
+ * class is used in practice in WebRTC.
  */
 @SuppressLint("NewApi")
 @RunWith(BaseJUnit4ClassRunner.class)
 public class NetworkMonitorTest {
   @Rule public UiThreadTestRule uiThreadTestRule = new UiThreadTestRule();
 
   /**
    * Listens for alerts fired by the NetworkMonitor when network status changes.
    */
   private static class NetworkMonitorTestObserver implements NetworkMonitor.NetworkObserver {
@@ skipping 101 matching lines @@
       return uiThreadHandler;
     }
   }
 
   /**
    * Helper method to create a network monitor and delegates for testing.
    */
   private void createTestMonitor() {
     Context context = InstrumentationRegistry.getTargetContext();
     NetworkMonitor.resetInstanceForTests();
-    NetworkMonitor.setAutoDetectConnectivityState(true);
+    NetworkMonitor.createAutoDetectorForTest();
     receiver = NetworkMonitor.getAutoDetectorForTest();
     assertNotNull(receiver);
 
     connectivityDelegate = new MockConnectivityManagerDelegate();
     connectivityDelegate.setActiveNetworkExists(true);
     receiver.setConnectivityManagerDelegateForTests(connectivityDelegate);
 
     wifiDelegate = new MockWifiManagerDelegate();
     receiver.setWifiManagerDelegateForTests(wifiDelegate);
     wifiDelegate.setWifiSSID("foo");
@@ skipping 102 matching lines @@
   @Test
   @UiThreadTest
   @SmallTest
   public void testQueryableAPIsDoNotCrash() {
     NetworkMonitorAutoDetect.Observer observer = new TestNetworkMonitorAutoDetectObserver();
     NetworkMonitorAutoDetect ncn =
         new NetworkMonitorAutoDetect(observer, InstrumentationRegistry.getTargetContext());
     ncn.getDefaultNetId();
   }
 }