Convert chrome InstrumentationTestCases to JUnit4 [2]

chrome/android/javatests/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferencesManagerTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferencesManagerTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferencesManagerTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferencesManagerTest.java
index 6e198514367aabc27a69adf542952eb522689ffc..ed9208b3e7317c8b93e8744a24d18f26c5c46949 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferencesManagerTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferencesManagerTest.java
@@ -5,20 +5,25 @@
 package org.chromium.chrome.browser.preferences.privacy;
 
 import android.content.Context;
+import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.SmallTest;
-import android.test.InstrumentationTestCase;
 import android.test.UiThreadTest;
 
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import org.chromium.base.CommandLine;
 import org.chromium.base.ContextUtils;
 import org.chromium.base.test.util.AdvancedMockContext;
 import org.chromium.base.test.util.Feature;
+import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 
 /**
  *  Tests "Usage and Crash reporting" preferences.
  */
-public class PrivacyPreferencesManagerTest extends InstrumentationTestCase {
-
+@RunWith(ChromeJUnit4ClassRunner.class)
+public class PrivacyPreferencesManagerTest {
     private static final boolean CONNECTED = true;
     private static final boolean DISCONNECTED = false;
 
@@ -38,6 +43,7 @@ public class PrivacyPreferencesManagerTest extends InstrumentationTestCase {
     // caching still works.
     private static final int REPS = 3;
 
+    @Test
     @SmallTest
     @Feature({"Android-AppBase"})
     @UiThreadTest
@@ -60,7 +66,8 @@ public class PrivacyPreferencesManagerTest extends InstrumentationTestCase {
     private void runTest(boolean isConnected, boolean wifiOn, boolean isMetricsReportingEnabled,
             boolean expectedMetricsUploadPermitted,
             boolean expectedNetworkAvailableForCrashUploads) {
-        PermissionContext context = new PermissionContext(getInstrumentation().getTargetContext());
+        PermissionContext context = new PermissionContext(
+                InstrumentationRegistry.getInstrumentation().getTargetContext());
         ContextUtils.initApplicationContextForTests(context.getApplicationContext());
         PrivacyPreferencesManager preferenceManager = new MockPrivacyPreferencesManager(
                 context, isConnected, wifiOn, isMetricsReportingEnabled);
@@ -70,12 +77,12 @@ public class PrivacyPreferencesManagerTest extends InstrumentationTestCase {
                     wifiOn, isMetricsReportingEnabled);
             String msg = String.format("Metrics reporting should be %1$b for %2$s",
                     expectedMetricsUploadPermitted, state);
-            assertEquals(msg, expectedMetricsUploadPermitted,
+            Assert.assertEquals(msg, expectedMetricsUploadPermitted,
                     preferenceManager.isMetricsUploadPermitted());
 
             msg = String.format("Crash reporting should be %1$b for wifi %2$s",
                     expectedNetworkAvailableForCrashUploads, wifiOn);
-            assertEquals(msg, expectedNetworkAvailableForCrashUploads,
+            Assert.assertEquals(msg, expectedNetworkAvailableForCrashUploads,
                     preferenceManager.isNetworkAvailableForCrashUploads());
         }
     }
@@ -114,7 +121,7 @@ public class PrivacyPreferencesManagerTest extends InstrumentationTestCase {
             if (Context.CONNECTIVITY_SERVICE.equals(name)) {
                 return null;
             }
-            fail("Should not ask for any other service than the ConnectionManager.");
+            Assert.fail("Should not ask for any other service than the ConnectionManager.");
             return super.getSystemService(name);
         }
     }