Chromium Code Reviews| Index: chrome/browser/sync/profile_sync_service_harness.cc |
| diff --git a/chrome/browser/sync/profile_sync_service_harness.cc b/chrome/browser/sync/profile_sync_service_harness.cc |
| index a2e3276e3fce042d3f8e5cd544a82dd9c9a0ec2c..6da3d1f22128f775906c668eaf5bc4f5a93eb580 100644 |
| --- a/chrome/browser/sync/profile_sync_service_harness.cc |
| +++ b/chrome/browser/sync/profile_sync_service_harness.cc |
| @@ -792,10 +792,11 @@ bool ProfileSyncServiceHarness::IsFullySynced() { |
| return false; |
| } |
| const SyncSessionSnapshot& snap = GetLastSessionSnapshot(); |
| - // snap.unsynced_count() == 0 is a fairly reliable indicator of whether or not |
| - // our timestamp is in sync with the server. |
| - bool is_fully_synced = IsDataSyncedImpl(snap) && |
| - snap.unsynced_count() == 0; |
| + // If we didn't try to commit anything in the previous cycle, there's a |
| + // good chance that we're now fully up to date. |
|
tim (not reviewing)
2012/05/23 16:41:18
"there's a good chance that" invites "what if" que
rlarocque
2012/05/25 20:03:31
Agreed, but that's not something this CL can fix.
|
| + bool is_fully_synced = |
| + (snap.errors().last_post_commit_result == browser_sync::UNSET) |
| + && IsDataSyncedImpl(snap); |
| DVLOG(1) << GetClientInfoString( |
| is_fully_synced ? "IsFullySynced: true" : "IsFullySynced: false"); |
| @@ -998,8 +999,6 @@ std::string ProfileSyncServiceHarness::GetClientInfoString( |
| << snap.has_more_to_sync() |
| << ", has_unsynced_items: " |
| << (service()->sync_initialized() ? service()->HasUnsyncedItems() : 0) |
| - << ", unsynced_count: " |
| - << snap.unsynced_count() |
| << ", encryption conflicts: " |
| << snap.num_encryption_conflicts() |
| << ", hierarchy conflicts: " |