Fix test crashes related to AccountManagerHelper.

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

Index: chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkBridgeTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkBridgeTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkBridgeTest.java
index 2dfcab8023c1dafa7e83559517bfcfdaea68718c..27544606f94bc5d915e3b76eadacd88bbec31376 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkBridgeTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkBridgeTest.java
@@ -5,7 +5,6 @@
 package org.chromium.chrome.browser.bookmarks;
 
 import android.support.test.filters.SmallTest;
-import android.support.test.rule.UiThreadTestRule;
 
 import org.junit.Assert;
 import org.junit.Before;
@@ -18,9 +17,9 @@ import org.chromium.base.test.BaseJUnit4ClassRunner;
 import org.chromium.base.test.util.Feature;
 import org.chromium.chrome.browser.bookmarks.BookmarkBridge.BookmarkItem;
 import org.chromium.chrome.browser.profiles.Profile;
+import org.chromium.chrome.browser.test.ChromeBrowserTestRule;
 import org.chromium.chrome.test.util.BookmarkTestUtil;
 import org.chromium.components.bookmarks.BookmarkId;
-import org.chromium.content.browser.test.NativeLibraryTestRule;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -33,10 +32,7 @@ import java.util.List;
 @RunWith(BaseJUnit4ClassRunner.class)
 public class BookmarkBridgeTest {
     @Rule
-    public NativeLibraryTestRule mActivityTestRule = new NativeLibraryTestRule();
-
-    @Rule
-    public UiThreadTestRule mUiThreadTestRule = new UiThreadTestRule();
+    public final ChromeBrowserTestRule mBrowserTestRule = new ChromeBrowserTestRule();
 
     private BookmarkBridge mBookmarkBridge;
     private BookmarkId mMobileNode;
@@ -45,8 +41,6 @@ public class BookmarkBridgeTest {
 
     @Before
     public void setUp() throws Exception {
-        mActivityTestRule.loadNativeLibraryAndInitBrowserProcess();
-
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
@@ -71,7 +65,7 @@ public class BookmarkBridgeTest {
     @SmallTest
     @Feature({"Bookmark"})
     public void testAddBookmarksAndFolders() throws Throwable {
-        mUiThreadTestRule.runOnUiThread(new Runnable() {
+        ThreadUtils.runOnUiThread(new Runnable() {
             @Override
             public void run() {
                 BookmarkId bookmarkA =
@@ -112,7 +106,7 @@ public class BookmarkBridgeTest {
     @SmallTest
     @Feature({"Bookmark"})
     public void testGetAllFoldersWithDepths() throws Throwable {
-        mUiThreadTestRule.runOnUiThread(new Runnable() {
+        ThreadUtils.runOnUiThread(new Runnable() {
             @Override
             public void run() {
                 BookmarkId folderA = mBookmarkBridge.addFolder(mMobileNode, 0, "a");
@@ -153,7 +147,7 @@ public class BookmarkBridgeTest {
     @SmallTest
     @Feature({"Bookmark"})
     public void testGetMoveDestinations() throws Throwable {
-        mUiThreadTestRule.runOnUiThread(new Runnable() {
+        ThreadUtils.runOnUiThread(new Runnable() {
             @Override
             public void run() {
                 BookmarkId folderA = mBookmarkBridge.addFolder(mMobileNode, 0, "a");