[Cronet] Switch from InstrumentationTest to junit

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.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
 import android.net.ConnectivityManager;
@@ skipping 182 matching lines @@
             if (activeNetIds.length >= 1) {
                 mLastNetIdSeen = activeNetIds[0];
             } else {
                 mLastNetIdSeen = NetId.INVALID;
             }
         }
 
         // Verify last notification was the expected one.
         public void assertLastChange(ChangeType type, int netId) throws Exception {
             // Make sure notification processed.
-            flushUiThreadTaskQueue();
+            NetworkChangeNotifierTestUtil.flushUiThreadTaskQueue();
             assertEquals(type, mLastChangeSeen);
             assertEquals(netId, mLastNetIdSeen);
             mLastChangeSeen = ChangeType.NONE;
             mLastNetIdSeen = NetId.INVALID;
         }
     }
 
     // Network.Network(int netId) pointer.
     private Constructor<Network> mNetworkConstructor;
     private NetworkChangeNotifierAutoDetect mReceiver;
@@ skipping 41 matching lines @@
         final NetworkChangeNotifierAutoDetect.NetworkState networkState =
                 mReceiver.getCurrentNetworkState();
         return mReceiver.getCurrentConnectionType(networkState);
     }
 
     // Create Network object given a NetID.
     private Network netIdToNetwork(int netId) throws Exception {
         return mNetworkConstructor.newInstance(netId);
     }
 
-    // Flush UI thread task queue.
-    private static void flushUiThreadTaskQueue() throws Exception {
-        FutureTask<Void> task = new FutureTask<Void>(new Runnable() {
-            public void run() {}
-        }, null);
-        ThreadUtils.postOnUiThread(task);
-        task.get();
-    }
-
     @Override
     protected void setUp() throws Exception {
         super.setUp();
         LibraryLoader.get(LibraryProcessType.PROCESS_BROWSER)
                 .ensureInitialized(getInstrumentation().getTargetContext());
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             // Find Network.Network(int netId) using reflection.
             mNetworkConstructor = Network.class.getConstructor(Integer.TYPE);
         }
         ThreadUtils.postOnUiThread(new Runnable() {
@@ skipping 324 matching lines @@
         // Simulate app backgrounding then foregrounding.
         assertTrue(ncn.isReceiverRegisteredForTesting());
         policy.onApplicationStateChange(ApplicationState.HAS_PAUSED_ACTIVITIES);
         assertFalse(ncn.isReceiverRegisteredForTesting());
         policy.onApplicationStateChange(ApplicationState.HAS_RUNNING_ACTIVITIES);
         assertTrue(ncn.isReceiverRegisteredForTesting());
         // Verify network list purged.
         observer.assertLastChange(ChangeType.PURGE_LIST, NetId.INVALID);
     }
 }