Fix test crashes related to AccountManagerHelper.

chrome/android/javatests/src/org/chromium/chrome/browser/autofill/PersonalDataManagerTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/autofill/PersonalDataManagerTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/PersonalDataManagerTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/PersonalDataManagerTest.java
index 6417f5ab25685d9fa09cded906b9395a268fe927..180940c353afc0a14aaefd787dc4bba7f0c420d7 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/PersonalDataManagerTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/PersonalDataManagerTest.java
@@ -11,6 +11,7 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.RuleChain;
 import org.junit.runner.RunWith;
 
 import org.chromium.base.test.BaseJUnit4ClassRunner;
@@ -18,8 +19,8 @@ import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.chrome.browser.autofill.PersonalDataManager.AutofillProfile;
 import org.chromium.chrome.browser.autofill.PersonalDataManager.CreditCard;
-import org.chromium.chrome.test.util.ApplicationData;
-import org.chromium.content.browser.test.NativeLibraryTestRule;
+import org.chromium.chrome.browser.test.ChromeBrowserTestRule;
+import org.chromium.chrome.browser.test.ClearAppDataTestRule;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -31,17 +32,18 @@ import java.util.concurrent.TimeoutException;
  */
 @RunWith(BaseJUnit4ClassRunner.class)
 public class PersonalDataManagerTest {
+    private final ChromeBrowserTestRule mBrowserTestRule = new ChromeBrowserTestRule();
+    private final ClearAppDataTestRule mClearAppDataTestRule =
+            new ClearAppDataTestRule(InstrumentationRegistry.getInstrumentation().getContext());
+
     @Rule
-    public NativeLibraryTestRule mActivityTestRule = new NativeLibraryTestRule();
+    public final RuleChain mChain =
+            RuleChain.outerRule(mClearAppDataTestRule).around(mBrowserTestRule);
 
     private AutofillTestHelper mHelper;
 
     @Before
-    public void setUp() throws Exception {
-        ApplicationData.clearAppData(
-                InstrumentationRegistry.getInstrumentation().getTargetContext());
-        mActivityTestRule.loadNativeLibraryAndInitBrowserProcess();
-
+    public void setUp() {
         mHelper = new AutofillTestHelper();
     }