[CodeHealth] Batch NavigationRecorderTest

Bug: 1474102
Change-Id: I52152e9d9e8bbbbb0cca21e538247b424b4abb68
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4795147
Reviewed-by: Dan H <harringtond@chromium.org>
Commit-Queue: Zhiyuan Cai <zhiyuancai@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1185441}

chrome/android/java/src/org/chromium/chrome/browser/app/feed/NavigationRecorderTest.java

@@ -11,19 +11,22 @@
 import androidx.test.filters.SmallTest;
 
 import org.junit.Before;
+import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.chromium.base.Callback;
 import org.chromium.base.Log;
+import org.chromium.base.test.util.Batch;
 import org.chromium.base.test.util.CallbackHelper;
 import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.chrome.browser.flags.ChromeSwitches;
 import org.chromium.chrome.browser.tab.EmptyTabObserver;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.chrome.test.ChromeTabbedActivityTestRule;
+import org.chromium.chrome.test.batch.BlankCTATabInitialStateRule;
 import org.chromium.chrome.test.util.ChromeTabUtils;
 import org.chromium.content_public.browser.LoadUrlParams;
 import org.chromium.content_public.browser.test.util.TestThreadUtils;
@@ -36,24 +39,28 @@
  * Instrumentation tests for {@link NavigationRecorder}.
  */
 @RunWith(ChromeJUnit4ClassRunner.class)
+@Batch(Batch.PER_CLASS)
 @CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE})
 public class NavigationRecorderTest {
     private static final String TAG = "NavRecorderTest";
+    @ClassRule
+    public static ChromeTabbedActivityTestRule sTestSetupRule = new ChromeTabbedActivityTestRule();
+
     @Rule
-    public ChromeTabbedActivityTestRule mTestSetupRule = new ChromeTabbedActivityTestRule();
+    public BlankCTATabInitialStateRule mBlankCTATabInitialStateRule =
+            new BlankCTATabInitialStateRule(sTestSetupRule, false);
 
     private EmbeddedTestServer mTestServer;
     private String mNavUrl;
     private Tab mInitialTab;
 
     @Before
     public void setUp() {
-        mTestServer = mTestSetupRule.getEmbeddedTestServerRule().getServer();
+        mTestServer = sTestSetupRule.getEmbeddedTestServerRule().getServer();
         mNavUrl = mTestServer.getURL("/chrome/test/data/android/google.html");
-        mTestSetupRule.startMainActivityOnBlankPage();
 
         TestThreadUtils.runOnUiThreadBlocking(() -> {
-            mInitialTab = mTestSetupRule.getActivity().getActivityTab();
+            mInitialTab = sTestSetupRule.getActivity().getActivityTab();
             // Add logging to debug flaky test: crbug.com/1297086.
             mInitialTab.addObserver(new EmptyTabObserver() {
                 @Override
@@ -104,7 +111,7 @@ public void onResult(NavigationRecorder.VisitData visit) {
             }
         });
 
-        mTestSetupRule.loadUrlInNewTab(null);
+        sTestSetupRule.loadUrlInNewTab(null);
         callback.waitForCallback(0);
     }
 
@@ -121,7 +128,7 @@ public void onResult(NavigationRecorder.VisitData visit) {
             }
         });
 
-        mTestSetupRule.loadUrl(mTestServer.getURL("/chrome/test/data/android/simple.html"));
+        sTestSetupRule.loadUrl(mTestServer.getURL("/chrome/test/data/android/simple.html"));
         callback.waitForCallback(0);
     }