Batch FilePersistedTabDataStorageTest and PersistedTabDataTest

FilePersistedTabDataStorageTest: 6744 ms -> 2003 ms (70% improvement)
PersistedTabDataTest: 1621 ms -> 178 ms (89% improvement)

Bug: 1158487
Change-Id: Ibe1c998aa4269955582c4a3d0548f61f5e939e33
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2590344Reviewed-by: Michael Thiessen <mthiesse@chromium.org>
Commit-Queue: David Maunder <davidjm@chromium.org>
Cr-Commit-Position: refs/heads/master@{#837134}

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

@@ -15,6 +15,7 @@ import org.mockito.MockitoAnnotations;
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.BaseJUnit4ClassRunner;
+import org.chromium.base.test.util.Batch;
 import org.chromium.chrome.browser.tab.state.FilePersistedTabDataStorage.FileSaveRequest;
 import org.chromium.chrome.test.ChromeBrowserTestRule;
 
@@ -25,6 +26,7 @@ import java.util.concurrent.Semaphore;
  * Tests relating to  {@link FilePersistedTabDataStorage}
  */
 @RunWith(BaseJUnit4ClassRunner.class)
+@Batch(Batch.PER_CLASS)
 public class FilePersistedTabDataStorageTest {
     @Rule
     public final ChromeBrowserTestRule mBrowserTestRule = new ChromeBrowserTestRule();

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

@@ -15,6 +15,7 @@ import org.mockito.MockitoAnnotations;
 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;
 
@@ -22,6 +23,7 @@ import org.chromium.chrome.browser.tab.Tab;
  * Test relating to {@link PersistedTabData}
  */
 @RunWith(BaseJUnit4ClassRunner.class)
+@Batch(Batch.UNIT_TESTS)
 public class PersistedTabDataTest {
     private static final int INITIAL_VALUE = 42;
     private static final int CHANGED_VALUE = 51;