Convert most of the rest of instrumentation tests in content

content/public/android/javatests/src/org/chromium/content/browser/LocationProviderTest.java

Index: content/public/android/javatests/src/org/chromium/content/browser/LocationProviderTest.java
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/LocationProviderTest.java b/content/public/android/javatests/src/org/chromium/content/browser/LocationProviderTest.java
index baed10135d35c6ee3a92f8712f63aadd7321db07..c74b6045236027e2d12b66a4bdfd4f409935d8fb 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/LocationProviderTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/LocationProviderTest.java
@@ -5,54 +5,68 @@
 package org.chromium.content.browser;
 
 import android.app.Activity;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
 import android.support.test.filters.SmallTest;
-import android.test.InstrumentationTestCase;
-import android.test.UiThreadTest;
+import android.support.test.rule.UiThreadTestRule;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import org.chromium.base.annotations.SuppressFBWarnings;
 import org.chromium.base.test.util.Feature;
+import org.chromium.content.browser.test.ContentJUnit4ClassRunner;
 import org.chromium.device.geolocation.LocationProviderAdapter;
 
 /**
  * Test suite for LocationProvider.
  */
-public class LocationProviderTest extends InstrumentationTestCase {
+@RunWith(ContentJUnit4ClassRunner.class)
+public class LocationProviderTest {
     private Activity mActivity;
     private LocationProviderAdapter mLocationProvider;
 
+    @Rule
+    public UiThreadTestRule mRule = new UiThreadTestRule();
+
+    @Before
     @SuppressFBWarnings("URF_UNREAD_FIELD")
-    @Override
     public void setUp() {
         mActivity = new Activity();
-        mLocationProvider =
-                LocationProviderAdapter.create(getInstrumentation().getTargetContext());
+        mLocationProvider = LocationProviderAdapter.create(
+                InstrumentationRegistry.getInstrumentation().getTargetContext());
     }
 
     /**
      * Verify a normal start/stop call pair without any activity pauses.
      */
+    @Test
     @SmallTest
     @UiThreadTest
     @Feature({"Location"})
     public void testStartStop() throws Exception {
         mLocationProvider.start(false);
-        assertTrue("Should be running", mLocationProvider.isRunning());
+        Assert.assertTrue("Should be running", mLocationProvider.isRunning());
         mLocationProvider.stop();
-        assertFalse("Should have stopped", mLocationProvider.isRunning());
+        Assert.assertFalse("Should have stopped", mLocationProvider.isRunning());
     }
 
     /**
      * Verify a start/upgrade/stop call sequence without any activity pauses.
      */
+    @Test
     @SmallTest
     @UiThreadTest
     @Feature({"Location"})
     public void testStartUpgradeStop() throws Exception {
         mLocationProvider.start(false);
-        assertTrue("Should be running", mLocationProvider.isRunning());
+        Assert.assertTrue("Should be running", mLocationProvider.isRunning());
         mLocationProvider.start(true);
-        assertTrue("Should be running", mLocationProvider.isRunning());
+        Assert.assertTrue("Should be running", mLocationProvider.isRunning());
         mLocationProvider.stop();
-        assertFalse("Should have stopped", mLocationProvider.isRunning());
+        Assert.assertFalse("Should have stopped", mLocationProvider.isRunning());
     }
 }