Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2367)

Unified Diff: chrome/browser/sync/test/integration/quiesce_status_change_checker.cc

Issue 2643643011: [Sync] Integ tests can't compare progress markers during configuration. (Closed)
Patch Set: Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/test/integration/quiesce_status_change_checker.cc
diff --git a/chrome/browser/sync/test/integration/quiesce_status_change_checker.cc b/chrome/browser/sync/test/integration/quiesce_status_change_checker.cc
index 8c488ae8b3bc9f0443aa1ce29e4ce09788367b4b..53b65fc63516b77ac6eae8a9ebdffa2dcd713a1f 100644
--- a/chrome/browser/sync/test/integration/quiesce_status_change_checker.cc
+++ b/chrome/browser/sync/test/integration/quiesce_status_change_checker.cc
@@ -23,6 +23,12 @@ bool IsSyncDisabled(browser_sync::ProfileSyncService* service) {
// Returns true if these services have matching progress markers.
bool ProgressMarkersMatch(const browser_sync::ProfileSyncService* service1,
const browser_sync::ProfileSyncService* service2) {
+ // GetActiveDataTypes() is always empty during configuration, so progress
+ // markers cannot be compared.
+ if (!service1->ConfigurationDone() || !service2->ConfigurationDone()) {
+ return false;
+ }
+
const syncer::ModelTypeSet common_types =
Intersection(service1->GetActiveDataTypes(),
service2->GetActiveDataTypes());
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698