Revert "Batch CriticalPersistedTabData tests"

This reverts commit fc868f17.

Reason for revert: Please refer to crbug.com/1156244

Original change's description:
> Batch CriticalPersistedTabData tests
>
> Apply batching to CriticalPersistedTabData tests so that they run
> faster.
>
> Bug: 1152295
> Change-Id: I655e4ffe2f79a8549311b32a1f7ff760f3dda34e
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2556453
> Reviewed-by: Yusuf Ozuysal <yusufo@chromium.org>
> Reviewed-by: Wei-Yin Chen (陳威尹) <wychen@chromium.org>
> Commit-Queue: David Maunder <davidjm@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#833794}

TBR=yusufo@chromium.org,wychen@chromium.org,davidjm@chromium.org,chromium-scoped@luci-project-accounts.iam.gserviceaccount.com

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 1152295, 1156244
Change-Id: Ib206dd5cf731a64493b505374ca03d622f519498
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2577611
Commit-Queue: Shimi Zhang <ctzsm@chromium.org>
Reviewed-by: Shimi Zhang <ctzsm@chromium.org>
Cr-Commit-Position: refs/heads/master@{#834444}

chrome/android/javatests/src/org/chromium/chrome/browser/tab/state/CriticalPersistedTabDataTest.java

@@ -12,7 +12,6 @@ import androidx.test.filters.SmallTest;
 
 import org.junit.Assert;
 import org.junit.Before;
-import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -23,13 +22,11 @@ import org.chromium.base.ThreadUtils;
 import org.chromium.base.supplier.ObservableSupplierImpl;
 import org.chromium.base.test.BaseJUnit4ClassRunner;
 import org.chromium.base.test.UiThreadTest;
-import org.chromium.base.test.util.Batch;
 import org.chromium.chrome.browser.tab.MockTab;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tab.TabImpl;
 import org.chromium.chrome.browser.tab.WebContentsState;
-import org.chromium.chrome.test.ChromeTabbedActivityTestRule;
-import org.chromium.chrome.test.batch.BlankCTATabInitialStateRule;
+import org.chromium.chrome.test.ChromeBrowserTestRule;
 
 import java.nio.ByteBuffer;
 import java.util.concurrent.Semaphore;
@@ -38,15 +35,9 @@ import java.util.concurrent.Semaphore;
  * Test relating to {@link CriticalPersistedTabData}
  */
 @RunWith(BaseJUnit4ClassRunner.class)
-@Batch(Batch.PER_CLASS)
 public class CriticalPersistedTabDataTest {
-    @ClassRule
-    public static ChromeTabbedActivityTestRule mActivityTestRule =
-            new ChromeTabbedActivityTestRule();
-
     @Rule
-    public BlankCTATabInitialStateRule mBlankCTATabInitialStateRule =
-            new BlankCTATabInitialStateRule(mActivityTestRule, false);
+    public final ChromeBrowserTestRule mBrowserTestRule = new ChromeBrowserTestRule();
 
     private static final int TAB_ID = 1;
     private static final int PARENT_ID = 2;