Convert WebappActivityTestBase and direct children to JUnit4.

chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappSplashScreenThemeColorTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappSplashScreenThemeColorTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappSplashScreenThemeColorTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappSplashScreenThemeColorTest.java
index eade40f77644993e3c17cd455fb59d1c2fdbbff9..ae36513b8b4ad8340c4d01de2e84710414c636ce 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappSplashScreenThemeColorTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappSplashScreenThemeColorTest.java
@@ -5,19 +5,28 @@
 package org.chromium.chrome.browser.webapps;
 
 import android.annotation.TargetApi;
-import android.content.Intent;
 import android.graphics.Color;
 import android.os.Build;
 import android.support.test.filters.SmallTest;
 
+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.ThreadUtils;
 import org.chromium.base.metrics.RecordHistogram;
+import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.RetryOnFailure;
+import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.browser.ShortcutHelper;
 import org.chromium.chrome.browser.metrics.WebappUma;
 import org.chromium.chrome.browser.tab.TabTestUtils;
 import org.chromium.chrome.browser.util.ColorUtils;
+import org.chromium.chrome.test.ChromeActivityTestRule;
+import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
 
@@ -26,32 +35,34 @@ import java.util.concurrent.Callable;
 /**
  * Tests for splash screens with EXTRA_THEME_COLOR specified in the Intent.
  */
-public class WebappSplashScreenThemeColorTest extends WebappActivityTestBase {
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        startWebappActivity();
-    }
+@RunWith(ChromeJUnit4ClassRunner.class)
+@CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE,
+        ChromeActivityTestRule.DISABLE_NETWORK_PREDICTION_FLAG})
+public class WebappSplashScreenThemeColorTest {
+    @Rule
+    public final WebappActivityTestRule mActivityTestRule = new WebappActivityTestRule();
 
-    @Override
-    protected Intent createIntent() {
-        Intent intent = super.createIntent();
-        intent.putExtra(ShortcutHelper.EXTRA_URL, "http://localhost");
-        // This is setting Color.Magenta with 50% opacity.
-        intent.putExtra(ShortcutHelper.EXTRA_THEME_COLOR, 0x80FF00FFL);
-        return intent;
+    @Before
+    public void setUp() throws Exception {
+        mActivityTestRule.startWebappActivity(
+                mActivityTestRule.createIntent()
+                        .putExtra(ShortcutHelper.EXTRA_URL, "http://localhost")
+                        // This is setting Color.Magenta with 50% opacity.
+                        .putExtra(ShortcutHelper.EXTRA_THEME_COLOR, 0x80FF00FFL));
     }
 
+    @Test
     @SmallTest
     @Feature({"Webapps"})
     @TargetApi(Build.VERSION_CODES.LOLLIPOP)
     public void testThemeColorWhenSpecified() {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) return;
 
-        assertEquals(ColorUtils.getDarkenedColorForStatusBar(Color.MAGENTA),
-                getActivity().getWindow().getStatusBarColor());
+        Assert.assertEquals(ColorUtils.getDarkenedColorForStatusBar(Color.MAGENTA),
+                mActivityTestRule.getActivity().getWindow().getStatusBarColor());
     }
 
+    @Test
     @SmallTest
     @Feature({"Webapps"})
     @TargetApi(Build.VERSION_CODES.LOLLIPOP)
@@ -62,7 +73,8 @@ public class WebappSplashScreenThemeColorTest extends WebappActivityTestBase {
         ThreadUtils.runOnUiThread(new Runnable() {
             @Override
             public void run() {
-                TabTestUtils.simulateChangeThemeColor(getActivity().getActivityTab(), Color.GREEN);
+                TabTestUtils.simulateChangeThemeColor(
+                        mActivityTestRule.getActivity().getActivityTab(), Color.GREEN);
             }
         });
 
@@ -71,16 +83,18 @@ public class WebappSplashScreenThemeColorTest extends WebappActivityTestBase {
                 ColorUtils.getDarkenedColorForStatusBar(Color.GREEN), new Callable<Integer>() {
                     @Override
                     public Integer call() {
-                        return getActivity().getWindow().getStatusBarColor();
+                        return mActivityTestRule.getActivity().getWindow().getStatusBarColor();
                     }
                 }));
     }
 
+    @Test
     @SmallTest
     @Feature({"Webapps"})
     public void testUmaThemeColorCustom() {
-        assertEquals(1, RecordHistogram.getHistogramValueCountForTesting(
-                WebappUma.HISTOGRAM_SPLASHSCREEN_THEMECOLOR,
-                WebappUma.SPLASHSCREEN_COLOR_STATUS_CUSTOM));
+        Assert.assertEquals(1,
+                RecordHistogram.getHistogramValueCountForTesting(
+                        WebappUma.HISTOGRAM_SPLASHSCREEN_THEMECOLOR,
+                        WebappUma.SPLASHSCREEN_COLOR_STATUS_CUSTOM));
     }
 }