Fix test crashes related to AccountManagerHelper.

chrome/android/javatests/src/org/chromium/chrome/browser/feedback/ConnectivityCheckerTestRule.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/feedback/ConnectivityCheckerTestRule.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/feedback/ConnectivityCheckerTestRule.java b/chrome/android/javatests/src/org/chromium/chrome/browser/feedback/ConnectivityCheckerTestRule.java
index 872a5ac36b2ad131b465a46c94361687370ce420..0c2e4e9eac4e697a35fea1bbf8ca241c87c3c8c6 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/feedback/ConnectivityCheckerTestRule.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/feedback/ConnectivityCheckerTestRule.java
@@ -9,7 +9,7 @@ import android.support.test.InstrumentationRegistry;
 import org.junit.runner.Description;
 import org.junit.runners.model.Statement;
 
-import org.chromium.content.browser.test.NativeLibraryTestRule;
+import org.chromium.chrome.browser.test.ChromeBrowserTestRule;
 import org.chromium.net.test.EmbeddedTestServer;
 
 /**
@@ -18,7 +18,7 @@ import org.chromium.net.test.EmbeddedTestServer;
  * It includes a {@link ConnectivityTestServer} which is set up and torn down automatically
  * for tests.
  */
-public class ConnectivityCheckerTestRule extends NativeLibraryTestRule {
+public class ConnectivityCheckerTestRule extends ChromeBrowserTestRule {
     public static final int TIMEOUT_MS = 5000;
 
     private EmbeddedTestServer mTestServer;
@@ -34,8 +34,11 @@ public class ConnectivityCheckerTestRule extends NativeLibraryTestRule {
             @Override
             public void evaluate() throws Throwable {
                 setUp();
-                base.evaluate();
-                tearDown();
+                try {
+                    base.evaluate();
+                } finally {
+                    tearDown();
+                }
             }
         }, description);
     }
@@ -57,7 +60,6 @@ public class ConnectivityCheckerTestRule extends NativeLibraryTestRule {
     }
 
     private void setUp() throws Exception {
-        loadNativeLibraryAndInitBrowserProcess();
         mTestServer = EmbeddedTestServer.createAndStartServer(
                 InstrumentationRegistry.getInstrumentation().getContext());
         mGenerated200Url = mTestServer.getURL("/echo?status=200");