Convert most of the rest of instrumentation tests in content

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

Index: content/public/android/javatests/src/org/chromium/content/browser/PhoneNumberDetectionTest.java
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/PhoneNumberDetectionTest.java b/content/public/android/javatests/src/org/chromium/content/browser/PhoneNumberDetectionTest.java
index ce9bf63ff3f8e7c3068fd18b71ebee4052ed2b1f..fb7bbdef1ecfdedb1a5dbdeb237eefd0c857a640 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/PhoneNumberDetectionTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/PhoneNumberDetectionTest.java
@@ -7,6 +7,12 @@ package org.chromium.content.browser;
 import android.support.test.filters.LargeTest;
 import android.support.test.filters.MediumTest;
 
+import org.junit.Assert;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.chromium.base.test.BaseJUnit4ClassRunner;
 import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.DisabledTest;
 import org.chromium.base.test.util.Feature;
@@ -16,206 +22,215 @@ import org.chromium.content.common.ContentSwitches;
 /**
  * Test suite for phone number detection.
  */
+@RunWith(BaseJUnit4ClassRunner.class)
 @CommandLineFlags.Add({ContentSwitches.ENABLE_CONTENT_INTENT_DETECTION})
-public class PhoneNumberDetectionTest extends ContentDetectionTestBase {
+public class PhoneNumberDetectionTest {
+    @Rule
+    public ContentDetectionActivityTestRule mActivityTestRule =
+            new ContentDetectionActivityTestRule();
 
     private static final String TELEPHONE_INTENT_PREFIX = "tel:";
 
     private boolean isExpectedTelephoneIntent(String intentUrl, String expectedContent) {
         if (intentUrl == null) return false;
-        final String expectedUrl = TELEPHONE_INTENT_PREFIX + urlForContent(expectedContent);
+        final String expectedUrl = TELEPHONE_INTENT_PREFIX
+                + ContentDetectionActivityTestRule.urlForContent(expectedContent);
         return intentUrl.equals(expectedUrl);
     }
 
+    @Test
     @LargeTest
     @Feature({"ContentDetection", "TabContents"})
     @CommandLineFlags.Add(ContentSwitches.NETWORK_COUNTRY_ISO + "=US")
     @RetryOnFailure
     public void testInternationalNumberIntents() throws Throwable {
-        startActivityWithTestUrl(
+        mActivityTestRule.launchContentShellWithUrlSync(
                 "content/test/data/android/content_detection/phone_international.html");
 
         // US: +1 650-253-0000.
-        String intentUrl = scrollAndTapExpectingIntent("US");
-        assertTrue(isExpectedTelephoneIntent(intentUrl, "+16502530000"));
+        String intentUrl = mActivityTestRule.scrollAndTapExpectingIntent("US");
+        Assert.assertTrue(isExpectedTelephoneIntent(intentUrl, "+16502530000"));
 
         // Australia: +61 2 9374 4000.
-        intentUrl = scrollAndTapExpectingIntent("Australia");
-        assertTrue(isExpectedTelephoneIntent(intentUrl, "+61293744000"));
+        intentUrl = mActivityTestRule.scrollAndTapExpectingIntent("Australia");
+        Assert.assertTrue(isExpectedTelephoneIntent(intentUrl, "+61293744000"));
 
         // China: +86-10-62503000.
-        intentUrl = scrollAndTapExpectingIntent("China");
-        assertTrue(isExpectedTelephoneIntent(intentUrl, "+861062503000"));
+        intentUrl = mActivityTestRule.scrollAndTapExpectingIntent("China");
+        Assert.assertTrue(isExpectedTelephoneIntent(intentUrl, "+861062503000"));
 
         // Hong Kong: +852-3923-5400.
-        intentUrl = scrollAndTapExpectingIntent("Hong Kong");
-        assertTrue(isExpectedTelephoneIntent(intentUrl, "+85239235400"));
+        intentUrl = mActivityTestRule.scrollAndTapExpectingIntent("Hong Kong");
+        Assert.assertTrue(isExpectedTelephoneIntent(intentUrl, "+85239235400"));
 
         // India: +91-80-67218000.
-        intentUrl = scrollAndTapExpectingIntent("India");
-        assertTrue(isExpectedTelephoneIntent(intentUrl, "+918067218000"));
+        intentUrl = mActivityTestRule.scrollAndTapExpectingIntent("India");
+        Assert.assertTrue(isExpectedTelephoneIntent(intentUrl, "+918067218000"));
 
         // Japan: +81-3-6384-9000.
-        intentUrl = scrollAndTapExpectingIntent("Japan");
-        assertTrue(isExpectedTelephoneIntent(intentUrl, "+81363849000"));
+        intentUrl = mActivityTestRule.scrollAndTapExpectingIntent("Japan");
+        Assert.assertTrue(isExpectedTelephoneIntent(intentUrl, "+81363849000"));
 
         // Korea: +82-2-531-9000.
-        intentUrl = scrollAndTapExpectingIntent("Korea");
-        assertTrue(isExpectedTelephoneIntent(intentUrl, "+8225319000"));
+        intentUrl = mActivityTestRule.scrollAndTapExpectingIntent("Korea");
+        Assert.assertTrue(isExpectedTelephoneIntent(intentUrl, "+8225319000"));
 
         // Singapore: +65 6521-8000.
-        intentUrl = scrollAndTapExpectingIntent("Singapore");
-        assertTrue(isExpectedTelephoneIntent(intentUrl, "+6565218000"));
+        intentUrl = mActivityTestRule.scrollAndTapExpectingIntent("Singapore");
+        Assert.assertTrue(isExpectedTelephoneIntent(intentUrl, "+6565218000"));
 
         // Taiwan: +886 2 8729 6000.
-        intentUrl = scrollAndTapExpectingIntent("Taiwan");
-        assertTrue(isExpectedTelephoneIntent(intentUrl, "+886287296000"));
+        intentUrl = mActivityTestRule.scrollAndTapExpectingIntent("Taiwan");
+        Assert.assertTrue(isExpectedTelephoneIntent(intentUrl, "+886287296000"));
 
         // Kenya: +254 20 360 1000.
-        intentUrl = scrollAndTapExpectingIntent("Kenya");
-        assertTrue(isExpectedTelephoneIntent(intentUrl, "+254203601000"));
+        intentUrl = mActivityTestRule.scrollAndTapExpectingIntent("Kenya");
+        Assert.assertTrue(isExpectedTelephoneIntent(intentUrl, "+254203601000"));
 
         // France: +33 (0)1 42 68 53 00.
-        intentUrl = scrollAndTapExpectingIntent("France");
-        assertTrue(isExpectedTelephoneIntent(intentUrl, "+33142685300"));
+        intentUrl = mActivityTestRule.scrollAndTapExpectingIntent("France");
+        Assert.assertTrue(isExpectedTelephoneIntent(intentUrl, "+33142685300"));
 
         // Germany: +49 40-80-81-79-000.
-        intentUrl = scrollAndTapExpectingIntent("Germany");
-        assertTrue(isExpectedTelephoneIntent(intentUrl, "+4940808179000"));
+        intentUrl = mActivityTestRule.scrollAndTapExpectingIntent("Germany");
+        Assert.assertTrue(isExpectedTelephoneIntent(intentUrl, "+4940808179000"));
 
         // Ireland: +353 (1) 436 1001.
-        intentUrl = scrollAndTapExpectingIntent("Ireland");
-        assertTrue(isExpectedTelephoneIntent(intentUrl, "+35314361001"));
+        intentUrl = mActivityTestRule.scrollAndTapExpectingIntent("Ireland");
+        Assert.assertTrue(isExpectedTelephoneIntent(intentUrl, "+35314361001"));
 
         // Italy: +39 02-36618 300.
-        intentUrl = scrollAndTapExpectingIntent("Italy");
-        assertTrue(isExpectedTelephoneIntent(intentUrl, "+390236618300"));
+        intentUrl = mActivityTestRule.scrollAndTapExpectingIntent("Italy");
+        Assert.assertTrue(isExpectedTelephoneIntent(intentUrl, "+390236618300"));
 
         // Netherlands: +31 (0)20-5045-100.
-        intentUrl = scrollAndTapExpectingIntent("Netherlands");
-        assertTrue(isExpectedTelephoneIntent(intentUrl, "+31205045100"));
+        intentUrl = mActivityTestRule.scrollAndTapExpectingIntent("Netherlands");
+        Assert.assertTrue(isExpectedTelephoneIntent(intentUrl, "+31205045100"));
 
         // Norway: +47 22996288.
-        intentUrl = scrollAndTapExpectingIntent("Norway");
-        assertTrue(isExpectedTelephoneIntent(intentUrl, "+4722996288"));
+        intentUrl = mActivityTestRule.scrollAndTapExpectingIntent("Norway");
+        Assert.assertTrue(isExpectedTelephoneIntent(intentUrl, "+4722996288"));
 
         // Poland: +48 (12) 68 15 300.
-        intentUrl = scrollAndTapExpectingIntent("Poland");
-        assertTrue(isExpectedTelephoneIntent(intentUrl, "+48126815300"));
+        intentUrl = mActivityTestRule.scrollAndTapExpectingIntent("Poland");
+        Assert.assertTrue(isExpectedTelephoneIntent(intentUrl, "+48126815300"));
 
         // Russia: +7-495-644-1400.
-        intentUrl = scrollAndTapExpectingIntent("Russia");
-        assertTrue(isExpectedTelephoneIntent(intentUrl, "+74956441400"));
+        intentUrl = mActivityTestRule.scrollAndTapExpectingIntent("Russia");
+        Assert.assertTrue(isExpectedTelephoneIntent(intentUrl, "+74956441400"));
 
         // Spain: +34 91-748-6400.
-        intentUrl = scrollAndTapExpectingIntent("Spain");
-        assertTrue(isExpectedTelephoneIntent(intentUrl, "+34917486400"));
+        intentUrl = mActivityTestRule.scrollAndTapExpectingIntent("Spain");
+        Assert.assertTrue(isExpectedTelephoneIntent(intentUrl, "+34917486400"));
 
         // Switzerland: +41 44-668-1800.
-        intentUrl = scrollAndTapExpectingIntent("Switzerland");
-        assertTrue(isExpectedTelephoneIntent(intentUrl, "+41446681800"));
+        intentUrl = mActivityTestRule.scrollAndTapExpectingIntent("Switzerland");
+        Assert.assertTrue(isExpectedTelephoneIntent(intentUrl, "+41446681800"));
 
         // UK: +44 (0)20-7031-3000.
-        intentUrl = scrollAndTapExpectingIntent("UK");
-        assertTrue(isExpectedTelephoneIntent(intentUrl, "+442070313000"));
+        intentUrl = mActivityTestRule.scrollAndTapExpectingIntent("UK");
+        Assert.assertTrue(isExpectedTelephoneIntent(intentUrl, "+442070313000"));
 
         // Canada: +1 514-670-8700.
-        intentUrl = scrollAndTapExpectingIntent("Canada");
-        assertTrue(isExpectedTelephoneIntent(intentUrl, "+15146708700"));
+        intentUrl = mActivityTestRule.scrollAndTapExpectingIntent("Canada");
+        Assert.assertTrue(isExpectedTelephoneIntent(intentUrl, "+15146708700"));
 
         // Argentina: +54-11-5530-3000.
-        intentUrl = scrollAndTapExpectingIntent("Argentina");
-        assertTrue(isExpectedTelephoneIntent(intentUrl, "+541155303000"));
+        intentUrl = mActivityTestRule.scrollAndTapExpectingIntent("Argentina");
+        Assert.assertTrue(isExpectedTelephoneIntent(intentUrl, "+541155303000"));
 
         // Brazil: +55-31-2128-6800.
-        intentUrl = scrollAndTapExpectingIntent("Brazil");
-        assertTrue(isExpectedTelephoneIntent(intentUrl, "+553121286800"));
+        intentUrl = mActivityTestRule.scrollAndTapExpectingIntent("Brazil");
+        Assert.assertTrue(isExpectedTelephoneIntent(intentUrl, "+553121286800"));
 
         // Mexico: +52 55-5342-8400.
-        intentUrl = scrollAndTapExpectingIntent("Mexico");
-        assertTrue(isExpectedTelephoneIntent(intentUrl, "+525553428400"));
+        intentUrl = mActivityTestRule.scrollAndTapExpectingIntent("Mexico");
+        Assert.assertTrue(isExpectedTelephoneIntent(intentUrl, "+525553428400"));
 
         // Israel: +972-74-746-6245.
-        intentUrl = scrollAndTapExpectingIntent("Israel");
-        assertTrue(isExpectedTelephoneIntent(intentUrl, "+972747466245"));
+        intentUrl = mActivityTestRule.scrollAndTapExpectingIntent("Israel");
+        Assert.assertTrue(isExpectedTelephoneIntent(intentUrl, "+972747466245"));
 
         // UAE: +971 4 4509500.
-        intentUrl = scrollAndTapExpectingIntent("UAE");
-        assertTrue(isExpectedTelephoneIntent(intentUrl, "+97144509500"));
+        intentUrl = mActivityTestRule.scrollAndTapExpectingIntent("UAE");
+        Assert.assertTrue(isExpectedTelephoneIntent(intentUrl, "+97144509500"));
     }
 
+    @Test
     @MediumTest
     @Feature({"ContentDetection", "TabContents"})
     @DisabledTest(message = "crbug.com/673279")
     @CommandLineFlags.Add(ContentSwitches.NETWORK_COUNTRY_ISO + "=US")
     public void testLocalUSNumbers() throws Throwable {
-        startActivityWithTestUrl(
+        mActivityTestRule.launchContentShellWithUrlSync(
                 "content/test/data/android/content_detection/phone_local.html");
 
         // US_1: 1-888-433-5788.
-        String intentUrl = scrollAndTapExpectingIntent("US_1");
-        assertTrue(isExpectedTelephoneIntent(intentUrl, "+18884335788"));
+        String intentUrl = mActivityTestRule.scrollAndTapExpectingIntent("US_1");
+        Assert.assertTrue(isExpectedTelephoneIntent(intentUrl, "+18884335788"));
 
         // US_2: 703-293-6299.
-        intentUrl = scrollAndTapExpectingIntent("US_2");
-        assertTrue(isExpectedTelephoneIntent(intentUrl, "+17032936299"));
+        intentUrl = mActivityTestRule.scrollAndTapExpectingIntent("US_2");
+        Assert.assertTrue(isExpectedTelephoneIntent(intentUrl, "+17032936299"));
 
         // US_3: (202) 456-2121.
-        intentUrl = scrollAndTapExpectingIntent("US_3");
-        assertTrue(isExpectedTelephoneIntent(intentUrl, "+12024562121"));
+        intentUrl = mActivityTestRule.scrollAndTapExpectingIntent("US_3");
+        Assert.assertTrue(isExpectedTelephoneIntent(intentUrl, "+12024562121"));
 
         // International numbers should still work.
-        intentUrl = scrollAndTapExpectingIntent("International");
-        assertTrue(isExpectedTelephoneIntent(intentUrl, "+31205045100"));
+        intentUrl = mActivityTestRule.scrollAndTapExpectingIntent("International");
+        Assert.assertTrue(isExpectedTelephoneIntent(intentUrl, "+31205045100"));
     }
 
+    @Test
     @MediumTest
     @Feature({"ContentDetection", "TabContents"})
     @DisabledTest(message = "crbug.com/673279")
     @CommandLineFlags.Add(ContentSwitches.NETWORK_COUNTRY_ISO + "=GB")
     public void testLocalUKNumbers() throws Throwable {
-        startActivityWithTestUrl(
+        mActivityTestRule.launchContentShellWithUrlSync(
                 "content/test/data/android/content_detection/phone_local.html");
 
         // GB_1: (0) 20 7323 8299.
-        String intentUrl = scrollAndTapExpectingIntent("GB_1");
-        assertTrue(isExpectedTelephoneIntent(intentUrl, "02073238299"));
+        String intentUrl = mActivityTestRule.scrollAndTapExpectingIntent("GB_1");
+        Assert.assertTrue(isExpectedTelephoneIntent(intentUrl, "02073238299"));
 
         // GB_2: 01227865330.
-        intentUrl = scrollAndTapExpectingIntent("GB_2");
-        assertTrue(isExpectedTelephoneIntent(intentUrl, "01227865330"));
+        intentUrl = mActivityTestRule.scrollAndTapExpectingIntent("GB_2");
+        Assert.assertTrue(isExpectedTelephoneIntent(intentUrl, "01227865330"));
 
         // GB_3: 01963 824686.
-        intentUrl = scrollAndTapExpectingIntent("GB_3");
-        assertTrue(isExpectedTelephoneIntent(intentUrl, "01963824686"));
+        intentUrl = mActivityTestRule.scrollAndTapExpectingIntent("GB_3");
+        Assert.assertTrue(isExpectedTelephoneIntent(intentUrl, "01963824686"));
 
         // International numbers should still work.
-        intentUrl = scrollAndTapExpectingIntent("International");
-        assertTrue(isExpectedTelephoneIntent(intentUrl, "+31205045100"));
+        intentUrl = mActivityTestRule.scrollAndTapExpectingIntent("International");
+        Assert.assertTrue(isExpectedTelephoneIntent(intentUrl, "+31205045100"));
     }
 
+    @Test
     @MediumTest
     @Feature({"ContentDetection", "TabContents"})
-    @CommandLineFlags.Add(ContentSwitches.NETWORK_COUNTRY_ISO + "=FR")
     @RetryOnFailure
+    @CommandLineFlags.Add(ContentSwitches.NETWORK_COUNTRY_ISO + "=FR")
     public void testLocalFRNumbers() throws Throwable {
-        startActivityWithTestUrl(
+        mActivityTestRule.launchContentShellWithUrlSync(
                 "content/test/data/android/content_detection/phone_local.html");
 
         // FR_1: 01 40 20 50 50.
-        String intentUrl = scrollAndTapExpectingIntent("FR_1");
-        assertTrue(isExpectedTelephoneIntent(intentUrl, "0140205050"));
+        String intentUrl = mActivityTestRule.scrollAndTapExpectingIntent("FR_1");
+        Assert.assertTrue(isExpectedTelephoneIntent(intentUrl, "0140205050"));
 
         // FR_2: 0326475534.
-        intentUrl = scrollAndTapExpectingIntent("FR_2");
-        assertTrue(isExpectedTelephoneIntent(intentUrl, "0326475534"));
+        intentUrl = mActivityTestRule.scrollAndTapExpectingIntent("FR_2");
+        Assert.assertTrue(isExpectedTelephoneIntent(intentUrl, "0326475534"));
 
         // FR_3: (0) 237 211 992.
-        intentUrl = scrollAndTapExpectingIntent("FR_3");
-        assertTrue(isExpectedTelephoneIntent(intentUrl, "0237211992"));
+        intentUrl = mActivityTestRule.scrollAndTapExpectingIntent("FR_3");
+        Assert.assertTrue(isExpectedTelephoneIntent(intentUrl, "0237211992"));
 
         // International numbers should still work.
-        intentUrl = scrollAndTapExpectingIntent("International");
-        assertTrue(isExpectedTelephoneIntent(intentUrl, "+31205045100"));
+        intentUrl = mActivityTestRule.scrollAndTapExpectingIntent("International");
+        Assert.assertTrue(isExpectedTelephoneIntent(intentUrl, "+31205045100"));
     }
 }