Revert of Convert ChromeActivityTestCaseBase direct children to JUnit4

chrome/android/javatests/src/org/chromium/chrome/browser/FocusedEditableTextFieldZoomTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/FocusedEditableTextFieldZoomTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/FocusedEditableTextFieldZoomTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/FocusedEditableTextFieldZoomTest.java
index d7281f9c7a04fde5b96ea019b1397dce03ff5581..faa46e046a660dac8ae79c08cbdb21aed7e33fee 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/FocusedEditableTextFieldZoomTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/FocusedEditableTextFieldZoomTest.java
@@ -6,21 +6,12 @@
 
 import static org.chromium.content.browser.test.util.CriteriaHelper.DEFAULT_POLLING_INTERVAL;
 
-import android.support.test.InstrumentationRegistry;
 import android.view.KeyEvent;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.DisabledTest;
 import org.chromium.base.test.util.Feature;
 import org.chromium.chrome.browser.tab.Tab;
-import org.chromium.chrome.test.ChromeActivityTestRule;
-import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
+import org.chromium.chrome.test.ChromeActivityTestCaseBase;
 import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
@@ -31,14 +22,7 @@
 /**
  * Tests for zooming into & out of a selected & deselected editable text field.
  */
-@RunWith(ChromeJUnit4ClassRunner.class)
-@CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE,
-        ChromeActivityTestRule.DISABLE_NETWORK_PREDICTION_FLAG})
-public class FocusedEditableTextFieldZoomTest {
-    @Rule
-    public ChromeActivityTestRule<ChromeActivity> mActivityTestRule =
-            new ChromeActivityTestRule<>(ChromeActivity.class);
-
+public class FocusedEditableTextFieldZoomTest extends ChromeActivityTestCaseBase<ChromeActivity> {
     private static final int TEST_TIMEOUT = 5000;
     private static final String TEXTFIELD_DOM_ID = "textfield";
     private static final float FLOAT_DELTA = 0.01f;
@@ -46,18 +30,20 @@
 
     private EmbeddedTestServer mTestServer;
 
-    @Before
-    public void setUp() throws Exception {
-        mTestServer = EmbeddedTestServer.createAndStartServer(
-                InstrumentationRegistry.getInstrumentation().getContext());
-        mActivityTestRule.startMainActivityWithURL(
-                mTestServer.getURL("/chrome/test/data/android/focused_editable_zoom.html"));
-        waitForInitialZoom();
+    public FocusedEditableTextFieldZoomTest() {
+        super(ChromeActivity.class);
     }
 
-    @After
-    public void tearDown() throws Exception {
+    @Override
+    protected void setUp() throws Exception {
+        mTestServer = EmbeddedTestServer.createAndStartServer(getInstrumentation().getContext());
+        super.setUp();
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
         mTestServer.stopAndDestroyServer();
+        super.tearDown();
     }
 
     void waitForInitialZoom() {
@@ -65,8 +51,7 @@
         // the initial value problematic. We solve this by explicitly specifying the initial zoom
         // level via the viewport tag and waiting for the zoom level to reach that value before we
         // proceed with the rest of the test.
-        final ContentViewCore contentViewCore =
-                mActivityTestRule.getActivity().getActivityTab().getContentViewCore();
+        final ContentViewCore contentViewCore = getActivity().getActivityTab().getContentViewCore();
         CriteriaHelper.pollInstrumentationThread(new Criteria() {
             @Override
             public boolean isSatisfied() {
@@ -88,12 +73,11 @@
     /*
      * @LargeTest
      */
-    @Test
     @DisabledTest(message = "Broken by subpixel precision changes crbug.com/371119")
     @Feature({"TabContents"})
     public void testZoomInToSelected() throws Throwable {
         // This should focus the text field and initiate a zoom in.
-        Tab tab = mActivityTestRule.getActivity().getActivityTab();
+        Tab tab = getActivity().getActivityTab();
         final ContentViewCore contentViewCore = tab.getContentViewCore();
         float initialZoomLevel = contentViewCore.getScale();
 
@@ -106,11 +90,10 @@
     /*
      * @LargeTest
      */
-    @Test
     @DisabledTest(message = "Broken by subpixel precision changes crbug.com/371119")
     @Feature({"TabContents"})
     public void testZoomOutOfSelectedIfOnlyBackPressed() throws Throwable {
-        final Tab tab = mActivityTestRule.getActivity().getActivityTab();
+        final Tab tab = getActivity().getActivityTab();
         final ContentViewCore contentViewCore = tab.getContentViewCore();
         final float initialZoomLevel = contentViewCore.getScale();
 
@@ -120,8 +103,7 @@
         // Wait for the zoom in to complete.
         waitForZoomIn(contentViewCore, initialZoomLevel);
 
-        KeyUtils.singleKeyEventView(
-                InstrumentationRegistry.getInstrumentation(), tab.getView(), KeyEvent.KEYCODE_BACK);
+        KeyUtils.singleKeyEventView(getInstrumentation(), tab.getView(), KeyEvent.KEYCODE_BACK);
 
         // We should zoom out to the previous zoom level.
         CriteriaHelper.pollInstrumentationThread(new Criteria() {
@@ -131,4 +113,11 @@
             }
         }, TEST_TIMEOUT, DEFAULT_POLLING_INTERVAL);
     }
+
+    @Override
+    public void startMainActivity() throws InterruptedException {
+        startMainActivityWithURL(mTestServer.getURL(
+                "/chrome/test/data/android/focused_editable_zoom.html"));
+        waitForInitialZoom();
+    }
 }