Commit 68fb6a8f authored by Alice Wang's avatar Alice Wang Committed by Commit Bot

Reland "[Android] Implement tests for SyncErrorCardPreference"

This is a reland of 773b24b9

Reland reason: the tests failure of the original CL is fixed
in https://crrev.com/c/2438500.

Original change's description:
> [Android] Implement tests for SyncErrorCardPreference
>
> This cl adds render tests for different types of sync errors in
> SyncErrorCardPreference.
>
> Bug: 1107420
> Change-Id: I3ebc308932eadb677310ea041559bb54bbb1765c
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2353255
> Commit-Queue: Tanmoy Mollik <triploblastic@chromium.org>
> Reviewed-by: Marc Treib <treib@chromium.org>
> Reviewed-by: Alice Wang <aliceywang@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#811273}

Bug: 1107420
Change-Id: Icdea13a04e71b55cf5ba0f99c8b24951c9666e16
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2440662
Commit-Queue: Alice Wang <aliceywang@chromium.org>
Reviewed-by: default avatarMarc Treib <treib@chromium.org>
Cr-Commit-Position: refs/heads/master@{#812608}
parent 36a75677
......@@ -540,6 +540,7 @@ chrome_test_java_sources = [
"javatests/src/org/chromium/chrome/browser/sync/OpenTabsTest.java",
"javatests/src/org/chromium/chrome/browser/sync/SyncAndServicesSettingsTest.java",
"javatests/src/org/chromium/chrome/browser/sync/SyncAndServicesSettingsWithFakeProfileSyncServiceTest.java",
"javatests/src/org/chromium/chrome/browser/sync/SyncErrorCardPreferenceTest.java",
"javatests/src/org/chromium/chrome/browser/sync/SyncTest.java",
"javatests/src/org/chromium/chrome/browser/sync/SyncTestRule.java",
"javatests/src/org/chromium/chrome/browser/sync/TypedUrlsTest.java",
......
......@@ -25,6 +25,7 @@ public class FakeProfileSyncService extends ProfileSyncService {
private boolean mTrustedVaultKeyRequired;
private boolean mTrustedVaultKeyRequiredForPreferredDataTypes;
private boolean mEncryptEverythingEnabled;
private boolean mRequiresClientUpgrade;
private Set<Integer> mChosenTypes = new HashSet<>();
private boolean mCanSyncFeatureStart;
@GoogleServiceAuthError.State
......@@ -139,4 +140,13 @@ public class FakeProfileSyncService extends ProfileSyncService {
public void setCanSyncFeatureStart(boolean canSyncFeatureStart) {
mCanSyncFeatureStart = canSyncFeatureStart;
}
@Override
public boolean requiresClientUpgrade() {
return mRequiresClientUpgrade;
}
public void setRequiresClientUpgrade(boolean requiresClientUpgrade) {
mRequiresClientUpgrade = requiresClientUpgrade;
}
}
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