[sync] Reland of "TwoClientBookmarksSyncTest.Sanity" is flaky

[sync] Reland of "TwoClientBookmarksSyncTest.Sanity" is flaky

Fix race condition in TwoClientUssSyncTest.ConflictResolution that was
exposed by the speedup
BUG=660655
R=zea@chromium.org

Committed: https://crrev.com/dcdd97e380a2f5125c55774f486eab1569625edd
Cr-Commit-Position: refs/heads/master@{#431944}

[Patrick Noland, 2016-11-11 23:00:42]

The CQ bit was checked by pnoland@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-11-11 23:01:28]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[Patrick Noland, 2016-11-11 23:46:27]

Nicolas, PTAL

[Nicolas Zea, 2016-11-12 00:07:31]

LGTM

FYI if you're relanding a patch with modifications, it's useful to have the
first patchset be the original patch, and the second patchset include any
changes. That way the reviewer can easily see what's changed by looking at the
diff

[commit-bot: I haz the power, 2016-11-12 01:31:22]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-11-12 01:31:23]

Dry run: This issue passed the CQ dry run.

[Patrick Noland, 2016-11-14 17:56:05]

The CQ bit was checked by pnoland@chromium.org to run a CQ dry run

[Patrick Noland, 2016-11-14 17:56:16]

Patchset #1 (id:1) has been deleted

[commit-bot: I haz the power, 2016-11-14 17:57:01]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[Patrick Noland, 2016-11-14 17:57:17]

Patchset #2 (id:40001) has been deleted

[Patrick Noland, 2016-11-14 17:58:41]

The CQ bit was checked by pnoland@chromium.org

[Patrick Noland, 2016-11-14 17:58:41]

The patchset sent to the CQ was uploaded after l-g-t-m from zea@chromium.org
Link to the patchset: https://codereview.chromium.org/2497533003/#ps60001
(title: "Fix TwoClientUssSyncTest.ConflictResolution")

[commit-bot: I haz the power, 2016-11-14 17:59:13]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-11-14 23:12:46]

Description was changed from

==========
[sync] Reland of "TwoClientBookmarksSyncTest.Sanity" is flaky

Fix race condition in TwoClientUssSyncTest.ConflictResolution that was
exposed by the speedup
BUG=660655

R=zea@chromium.org
==========

to

==========
[sync] Reland of "TwoClientBookmarksSyncTest.Sanity" is flaky

Fix race condition in TwoClientUssSyncTest.ConflictResolution that was
exposed by the speedup
BUG=660655

R=zea@chromium.org

Committed: https://crrev.com/dcdd97e380a2f5125c55774f486eab1569625edd
Cr-Commit-Position: refs/heads/master@{#431944}
==========

[commit-bot: I haz the power, 2016-11-14 23:12:47]

Patchset 2 (id:??) landed as
https://crrev.com/dcdd97e380a2f5125c55774f486eab1569625edd
Cr-Commit-Position: refs/heads/master@{#431944}

[stgao, 2016-11-21 19:47:45]

FYI: this CL seems to make TwoClientSessionsSyncTest.DeleteIdleSession flaky as
show in
https://findit-for-me.appspot.com/waterfall/check-flake?master_name=chromium....

One occurrence on Waterfall is
https://build.chromium.org/p/chromium.mac/builders/Mac10.9%20Tests/builds/32055