Convert the rest of chrome_public_test_apk InstrumentationTestCases to JUnit4

chrome/android/javatests/src/org/chromium/chrome/browser/download/SystemDownloadNotifierTest.java

 // Copyright 2015 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.chrome.browser.download;
 
 import android.content.Context;
+import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.SmallTest;
-import android.test.InstrumentationTestCase;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.AdvancedMockContext;
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.RetryOnFailure;
+import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
 
 import java.util.UUID;
 
 /**
  * Tests of {@link SystemDownloadNotifier}.
  */
-public class SystemDownloadNotifierTest extends InstrumentationTestCase {
+@RunWith(ChromeJUnit4ClassRunner.class)
+public class SystemDownloadNotifierTest {
     private MockSystemDownloadNotifier mDownloadNotifier;
     private MockDownloadNotificationService mService;
 
     static class MockSystemDownloadNotifier extends SystemDownloadNotifier {
         boolean mStarted = false;
 
         MockSystemDownloadNotifier(Context context) {
             super(context);
         }
 
@@ skipping 19 matching lines @@
             ThreadUtils.runOnUiThreadBlocking(new Runnable() {
                 @Override
                 public void run() {
                     MockSystemDownloadNotifier.super.updateDownloadNotification(
                             notificationInfo, autoRelease);
                 }
             });
         }
     }
 
-    @Override
+    @Before
     public void setUp() throws Exception {
-        super.setUp();
-        mDownloadNotifier = new MockSystemDownloadNotifier(getInstrumentation().getTargetContext());
+        mDownloadNotifier = new MockSystemDownloadNotifier(
+                InstrumentationRegistry.getInstrumentation().getTargetContext());
     }
 
     /**
      * Helper method to simulate that the DownloadNotificationService is connected.
      */
     private void onServiceConnected() {
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
                 mService = new MockDownloadNotificationService();
-                mService.setContext(new AdvancedMockContext(
-                        getInstrumentation().getTargetContext().getApplicationContext()));
+                mService.setContext(
+                        new AdvancedMockContext(InstrumentationRegistry.getInstrumentation()
+                                                        .getTargetContext()
+                                                        .getApplicationContext()));
                 mService.onCreate();
             }
         });
         mDownloadNotifier.setDownloadNotificationService(mService);
         mDownloadNotifier.handlePendingNotifications();
     }
 
     /**
      * Tests that pending notifications will be handled after service is connected.
      */
+    @Test
     @SmallTest
     @Feature({"Download"})
     @RetryOnFailure
     public void testNotificationNotHandledUntilServiceConnection() {
         DownloadInfo info = new DownloadInfo.Builder()
                 .setDownloadGuid(UUID.randomUUID().toString()).build();
         mDownloadNotifier.notifyDownloadProgress(info, 1L, true);
         CriteriaHelper.pollUiThread(new Criteria() {
             @Override
             public boolean isSatisfied() {
                 return mDownloadNotifier.mStarted;
             }
         });
 
         onServiceConnected();
-        assertEquals(1, mService.getNotificationIds().size());
+        Assert.assertEquals(1, mService.getNotificationIds().size());
     }
 
     /**
      * Tests that service will be stopped once all notifications are inactive.
      */
+    @Test
     @SmallTest
     @Feature({"Download"})
     public void testServiceStoppedWhenAllDownloadsFinish() {
         onServiceConnected();
         DownloadInfo info = new DownloadInfo.Builder()
                 .setDownloadGuid(UUID.randomUUID().toString()).build();
         mDownloadNotifier.notifyDownloadProgress(info, 1L, true);
         CriteriaHelper.pollUiThread(new Criteria() {
             @Override
             public boolean isSatisfied() {
                 return mDownloadNotifier.mStarted;
             }
         });
         DownloadInfo info2 = new DownloadInfo.Builder()
                 .setDownloadGuid(UUID.randomUUID().toString()).build();
         mDownloadNotifier.notifyDownloadProgress(info2, 1L, true);
 
         mDownloadNotifier.notifyDownloadFailed(info);
         mDownloadNotifier.notifyDownloadSuccessful(info2, 100L, true, false);
         CriteriaHelper.pollUiThread(new Criteria() {
             @Override
             public boolean isSatisfied() {
                 return !mDownloadNotifier.mStarted;
             }
         });
     }
 }