| Index: chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeActivityTestCaseBase.java
|
| diff --git a/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeActivityTestCaseBase.java b/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeActivityTestCaseBase.java
|
| index 80616dabc89670d15eb9c0836dc47d59f4c1ac6f..725048b20a738a0c80dc3698b1d1cc99e172b3ea 100644
|
| --- a/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeActivityTestCaseBase.java
|
| +++ b/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeActivityTestCaseBase.java
|
| @@ -71,6 +71,7 @@
|
| import java.io.File;
|
| import java.lang.reflect.AnnotatedElement;
|
| import java.lang.reflect.Method;
|
| +import java.util.Calendar;
|
| import java.util.LinkedList;
|
| import java.util.List;
|
| import java.util.Map;
|
| @@ -141,6 +142,11 @@ protected void setUp() throws Exception {
|
| Thread.setDefaultUncaughtExceptionHandler(new ChromeUncaughtExceptionHandler());
|
| ApplicationTestUtils.setUp(getInstrumentation().getTargetContext(), !mSkipClearAppData);
|
| setActivityInitialTouchMode(false);
|
| +
|
| + // Preload Calendar so that it does not trigger ReadFromDisk Strict mode violations if
|
| + // called on the UI Thread. See https://crbug.com/705477 and https://crbug.com/577185
|
| + Calendar.getInstance();
|
| +
|
| startMainActivity();
|
| }
|
|
|
|
|