Fix test crashes related to AccountManagerHelper.

chrome/android/javatests/src/org/chromium/chrome/browser/WarmupManagerTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/WarmupManagerTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/WarmupManagerTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/WarmupManagerTest.java
index 6614aa7de2619b7b1719362f0ed54aa983d1fb2c..77a157df431450a7df486bee6d4befc0341f86d7 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/WarmupManagerTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/WarmupManagerTest.java
@@ -10,7 +10,6 @@ import static org.chromium.base.test.util.Restriction.RESTRICTION_TYPE_NON_LOW_E
 import android.content.Context;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.SmallTest;
-import android.support.test.rule.UiThreadTestRule;
 
 import org.junit.After;
 import org.junit.Assert;
@@ -24,7 +23,7 @@ import org.chromium.base.test.BaseJUnit4ClassRunner;
 import org.chromium.base.test.util.MetricsUtils;
 import org.chromium.base.test.util.Restriction;
 import org.chromium.chrome.R;
-import org.chromium.content.browser.test.NativeLibraryTestRule;
+import org.chromium.chrome.browser.test.ChromeBrowserTestRule;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
 import org.chromium.content_public.browser.WebContents;
@@ -37,16 +36,12 @@ import java.util.concurrent.atomic.AtomicReference;
 @RunWith(BaseJUnit4ClassRunner.class)
 public class WarmupManagerTest {
     @Rule
-    public NativeLibraryTestRule mActivityTestRule = new NativeLibraryTestRule();
-
-    @Rule
-    public UiThreadTestRule mUiThreadTestRule = new UiThreadTestRule();
+    public final ChromeBrowserTestRule mBrowserTestRule = new ChromeBrowserTestRule();
 
     private WarmupManager mWarmupManager;
 
     @Before
     public void setUp() throws Exception {
-        mActivityTestRule.loadNativeLibraryAndInitBrowserProcess();
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
@@ -69,7 +64,7 @@ public class WarmupManagerTest {
     @SmallTest
     @Restriction(RESTRICTION_TYPE_LOW_END_DEVICE)
     public void testNoSpareRendererOnLowEndDevices() throws Throwable {
-        mUiThreadTestRule.runOnUiThread(new Runnable() {
+        ThreadUtils.runOnUiThread(new Runnable() {
             @Override
             public void run() {
                 mWarmupManager.createSpareWebContents();
@@ -125,7 +120,7 @@ public class WarmupManagerTest {
     @SmallTest
     @Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
     public void testTakeSpareWebContents() throws Throwable {
-        mUiThreadTestRule.runOnUiThread(new Runnable() {
+        ThreadUtils.runOnUiThread(new Runnable() {
             @Override
             public void run() {
                 mWarmupManager.createSpareWebContents();
@@ -141,7 +136,7 @@ public class WarmupManagerTest {
     @SmallTest
     @Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
     public void testTakeSpareWebContentsChecksArguments() throws Throwable {
-        mUiThreadTestRule.runOnUiThread(new Runnable() {
+        ThreadUtils.runOnUiThread(new Runnable() {
             @Override
             public void run() {
                 mWarmupManager.createSpareWebContents();
@@ -157,7 +152,7 @@ public class WarmupManagerTest {
     @SmallTest
     @Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
     public void testClearsDeadWebContents() throws Throwable {
-        mUiThreadTestRule.runOnUiThread(new Runnable() {
+        ThreadUtils.runOnUiThread(new Runnable() {
             @Override
             public void run() {
                 mWarmupManager.createSpareWebContents();
@@ -171,7 +166,7 @@ public class WarmupManagerTest {
     @SmallTest
     @Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
     public void testRecordSpareWebContentsStatus() throws Throwable {
-        mUiThreadTestRule.runOnUiThread(new Runnable() {
+        ThreadUtils.runOnUiThread(new Runnable() {
             @Override
             public void run() {
                 String name = WarmupManager.WEBCONTENTS_STATUS_HISTOGRAM;
@@ -212,7 +207,7 @@ public class WarmupManagerTest {
     @Test
     @SmallTest
     public void testInflateLayout() throws Throwable {
-        mUiThreadTestRule.runOnUiThread(new Runnable() {
+        ThreadUtils.runOnUiThread(new Runnable() {
             @Override
             public void run() {
                 int layoutId = R.layout.custom_tabs_control_container;