Index: chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/signin/SigninTestUtil.java |
diff --git a/chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/signin/SigninTestUtil.java b/chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/signin/SigninTestUtil.java |
index 5cd21f5b4b0631ec2884729aaa5675a224fa0d46..b406ff6ec0f8465b7440636c72b9180ec575f309 100644 |
--- a/chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/signin/SigninTestUtil.java |
+++ b/chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/signin/SigninTestUtil.java |
@@ -10,6 +10,7 @@ import android.content.Context; |
import org.chromium.base.ContextUtils; |
import org.chromium.base.ThreadUtils; |
+import org.chromium.chrome.browser.init.ProcessInitializationHandler; |
import org.chromium.chrome.browser.signin.AccountIdProvider; |
import org.chromium.chrome.browser.signin.AccountTrackerService; |
import org.chromium.chrome.browser.signin.OAuth2TokenService; |
@@ -39,6 +40,12 @@ public final class SigninTestUtil { |
public static void setUpAuthForTest(Instrumentation instrumentation) { |
assert sContext == null; |
sContext = instrumentation.getTargetContext(); |
+ ThreadUtils.runOnUiThreadBlocking(new Runnable() { |
+ @Override |
+ public void run() { |
+ ProcessInitializationHandler.getInstance().initializePreNative(); |
+ } |
+ }); |
sAccountManager = new MockAccountManager(sContext, instrumentation.getContext()); |
AccountManagerHelper.overrideAccountManagerHelperForTests(sContext, sAccountManager); |
overrideAccountIdProvider(); |