Batch ThumbnailDiskStorageTest and ThumbnailMediaParserTest

Speedup ThumbnailDiskStorageTest: 43532ms -> 7442ms (83%)
Speedup ThumbnailMediaParserTest: 12166ms -> 5897ms (52%)

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

chrome/browser/thumbnail/generator/android/java/src/org/chromium/chrome/browser/thumbnail/generator/ThumbnailDiskStorageTest.java

@@ -18,6 +18,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import org.chromium.base.test.util.Batch;
 import org.chromium.base.test.util.Criteria;
 import org.chromium.base.test.util.CriteriaHelper;
 import org.chromium.base.test.util.FlakyTest;
@@ -35,6 +36,7 @@ import java.util.concurrent.atomic.AtomicInteger;
  * Tests ThumbnailProviderDiskStorage.
  */
 @RunWith(ChromeJUnit4ClassRunner.class)
+@Batch(Batch.UNIT_TESTS)
 public class ThumbnailDiskStorageTest {
     private static final String TAG = "ThumbnailDiskTest";
     private static final String CONTENT_ID1 = "contentId1";
@@ -46,7 +48,7 @@ public class ThumbnailDiskStorageTest {
     private static final Bitmap BITMAP2 = BitmapFactory.decodeFile(FILE_PATH2);
     private static final int ICON_WIDTH1 = 50;
     private static final int ICON_WIDTH2 = 70;
-    private static final int TEST_MAX_CACHE_BYTES = 1 * ConversionUtils.BYTES_PER_MEGABYTE;
+    private static final int TEST_MAX_CACHE_BYTES = 50 * ConversionUtils.BYTES_PER_KILOBYTE;
 
     private static final long TIMEOUT_MS = 10000;
     private static final long INTERVAL_MS = 500;

chrome/browser/thumbnail/generator/android/java/src/org/chromium/chrome/browser/thumbnail/generator/ThumbnailMediaParserTest.java

@@ -12,6 +12,7 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import org.chromium.base.test.util.Batch;
 import org.chromium.base.test.util.CriteriaHelper;
 import org.chromium.base.test.util.DisabledTest;
 import org.chromium.base.test.util.Feature;
@@ -36,6 +37,7 @@ import java.io.File;
  * Because each media parser call may perform multiple process and thread hops, it can be slow.
  */
 @RunWith(ChromeJUnit4ClassRunner.class)
+@Batch(Batch.PER_CLASS)
 public class ThumbnailMediaParserTest {
     private static final long MAX_MEDIA_PARSER_POLL_TIME_MS = 10000;
     private static final long MEDIA_PARSER_POLL_INTERVAL_MS = 1000;