[Test] Batch tests in BookmarkEditTest

Batch tests in BookmarkEditTest to reduce runtime of
chrome_public_test_apk.

Bug: 1145843
Change-Id: I51db09cba8262f92476caa4aabb7693947ab9d22
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2523328Reviewed-by: Marc Treib <treib@chromium.org>
Commit-Queue: Tanmoy Mollik <triploblastic@chromium.org>
Cr-Commit-Position: refs/heads/master@{#826773}

chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkEditTest.java

@@ -24,6 +24,7 @@ import org.chromium.base.ActivityState;
 import org.chromium.base.ApplicationStatus;
 import org.chromium.base.ApplicationStatus.ActivityStateListener;
 import org.chromium.base.test.BaseJUnit4ClassRunner;
+import org.chromium.base.test.util.Batch;
 import org.chromium.base.test.util.CallbackHelper;
 import org.chromium.base.test.util.CriteriaHelper;
 import org.chromium.base.test.util.Feature;
@@ -42,6 +43,7 @@ import java.util.concurrent.TimeoutException;
  * Tests functionality in BookmarkEditActivity.
  */
 @RunWith(BaseJUnit4ClassRunner.class)
+@Batch(Batch.PER_CLASS)
 public class BookmarkEditTest {
     private static final String TITLE_A = "a";
     private static final String TITLE_B = "b";
@@ -98,6 +100,8 @@ public class BookmarkEditTest {
 
     @After
     public void tearDown() {
+        mBookmarkModel.removeObserver(mModelObserver);
+        TestThreadUtils.runOnUiThreadBlocking(() -> mBookmarkModel.removeAllUserBookmarks());
         ApplicationStatus.unregisterActivityStateListener(mActivityStateListener);
     }