Convert the rest of chrome_public_test_apk InstrumentationTestCases to JUnit4

chrome/android/javatests/src/org/chromium/chrome/browser/identity/UuidBasedUniqueIdentificationGeneratorTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/identity/UuidBasedUniqueIdentificationGeneratorTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/identity/UuidBasedUniqueIdentificationGeneratorTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/identity/UuidBasedUniqueIdentificationGeneratorTest.java
index b7ff5d88e92e70ac0bcb934af373243ad99302d1..0434c866bc09e33080c8171f36d53935faab9143 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/identity/UuidBasedUniqueIdentificationGeneratorTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/identity/UuidBasedUniqueIdentificationGeneratorTest.java
@@ -4,25 +4,31 @@
 
 package org.chromium.chrome.browser.identity;
 
+import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.SmallTest;
-import android.test.InstrumentationTestCase;
 
-import junit.framework.Assert;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import org.chromium.base.test.util.AdvancedMockContext;
 import org.chromium.base.test.util.Feature;
+import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 
-public class UuidBasedUniqueIdentificationGeneratorTest extends InstrumentationTestCase {
+@RunWith(ChromeJUnit4ClassRunner.class)
+public class UuidBasedUniqueIdentificationGeneratorTest {
     private static final String FLAG_UUID = "uuid";
 
     private AdvancedMockContext mContext;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mContext = new AdvancedMockContext(getInstrumentation().getTargetContext());
+    @Before
+    public void setUp() throws Exception {
+        mContext = new AdvancedMockContext(
+                InstrumentationRegistry.getInstrumentation().getTargetContext());
     }
 
+    @Test
     @SmallTest
     @Feature({"Sync"})
     public void testGenerationAndRestorationOfUuid() {
@@ -36,16 +42,17 @@ public class UuidBasedUniqueIdentificationGeneratorTest extends InstrumentationT
         // Asking for a unique ID again, should not try to regenerate it.
         mContext.clearFlag(FLAG_UUID);
         Assert.assertEquals(expectedUniqueId, generator.getUniqueId(null));
-        assertFalse(mContext.isFlagSet(FLAG_UUID));
+        Assert.assertFalse(mContext.isFlagSet(FLAG_UUID));
 
         // After a restart, the TestGenerator should read the UUID from a preference, instead of
         // asking for it.
         mContext.clearFlag(FLAG_UUID);
         generator = new TestGenerator(mContext, preferenceKey, null);
         Assert.assertEquals(expectedUniqueId, generator.getUniqueId(null));
-        assertFalse(mContext.isFlagSet(FLAG_UUID));
+        Assert.assertFalse(mContext.isFlagSet(FLAG_UUID));
     }
 
+    @Test
     @SmallTest
     @Feature({"Sync"})
     public void testTwoDifferentGeneratorsShouldUseDifferentPreferences() {
@@ -63,10 +70,10 @@ public class UuidBasedUniqueIdentificationGeneratorTest extends InstrumentationT
         // Asking for a unique ID again, should not try to regenerate it.
         mContext.clearFlag(FLAG_UUID);
         Assert.assertEquals(expectedUniqueId1, generator1.getUniqueId(null));
-        assertFalse(mContext.isFlagSet(FLAG_UUID));
+        Assert.assertFalse(mContext.isFlagSet(FLAG_UUID));
         mContext.clearFlag(FLAG_UUID);
         Assert.assertEquals(expectedUniqueId2, generator2.getUniqueId(null));
-        assertFalse(mContext.isFlagSet(FLAG_UUID));
+        Assert.assertFalse(mContext.isFlagSet(FLAG_UUID));
     }
 
     private static class TestGenerator extends UuidBasedUniqueIdentificationGenerator {