| 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 50eac128a2e697e50ef7a7c9d0c5a23053269d32..e37653a20a35d726cdadb1399f32d5204b2be81b 100644
|
| --- a/chrome/browser/sync/profile_sync_service_harness.cc
|
| +++ b/chrome/browser/sync/profile_sync_service_harness.cc
|
| @@ -786,10 +786,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.
|
| + 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");
|
| @@ -992,8 +993,6 @@ std::string ProfileSyncServiceHarness::GetClientInfoString(
|
| << snap.has_more_to_sync()
|
| << ", has_unsynced_items: "
|
| << service()->HasUnsyncedItems()
|
| - << ", unsynced_count: "
|
| - << snap.unsynced_count()
|
| << ", encryption conflicts: "
|
| << snap.num_encryption_conflicts()
|
| << ", hierarchy conflicts: "
|
|
|