Commit 489cf13f authored by Boris Sazonov's avatar Boris Sazonov Committed by Commit Bot

[Android] Mock AndroidSyncSettings before starting activity in SyncTestRule

This CL reorders calls in SyncTestRule so AndroidSyncSettings instance
is overridden before activity is started. This is done to prevent
classes initialized during activity initialization from grabbing
a reference to the default AndroidSyncSettings.

Bug: 903657, 903658, 906188, 906193, 906788
Change-Id: Ib412d7748a8ec6f48b80436051a932d6b7713940
Reviewed-on: https://chromium-review.googlesource.com/c/1356583Reviewed-by: default avatarMarc Treib <treib@chromium.org>
Commit-Queue: Boris Sazonov <bsazonov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#612637}
parent ba36bdbb
......@@ -219,11 +219,11 @@ public class SyncTestRule extends ChromeActivityTestRule<ChromeActivity> {
final Statement base = super.apply(new Statement() {
@Override
public void evaluate() throws Throwable {
setUpMockAndroidSyncSettings();
startMainActivityForSyncTest();
mContext = InstrumentationRegistry.getTargetContext();
setUpMockAndroidSyncSettings();
ThreadUtils.runOnUiThreadBlocking(new Runnable() {
@Override
public void run() {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment