[Sync] USS: Filter out tombstones for initial sync.

[Sync] USS: Filter out tombstones for initial sync.

Also prevents migration from sending tombstones.

BUG=680550
Review-Url: https://codereview.chromium.org/2630613002
Cr-Commit-Position: refs/heads/master@{#444219}
Committed: https://chromium.googlesource.com/chromium/src/+/23a04c49a42e8ddef2bcc9755f02038840409475

[maxbogue, 2017-01-12 22:10:24]

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

[commit-bot: I haz the power, 2017-01-12 22:10:59]

Dry run: 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, 2017-01-13 00:05:16]

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

[commit-bot: I haz the power, 2017-01-13 00:05:17]

Dry run: This issue passed the CQ dry run.

[maxbogue, 2017-01-13 00:09:10]

maxbogue@chromium.org changed reviewers:
+ pavely@chromium.org, skym@chromium.org

[maxbogue, 2017-01-13 00:09:11]

Sky and/or Pavel, PTAL!

[skym, 2017-01-13 16:31:23]

lgtm

https://codereview.chromium.org/2630613002/diff/1/components/sync/engine_impl...
File components/sync/engine_impl/test_entry_factory.cc (right):

https://codereview.chromium.org/2630613002/diff/1/components/sync/engine_impl...
components/sync/engine_impl/test_entry_factory.cc:203: int64_t
TestEntryFactory::CreateTombstone(const std::string& name,
It seems like there's a lot of duplicated logic between this and
CreateSyncedItem. Is there a reason that consolidating this logic somewhere
shared isn't easy?

https://codereview.chromium.org/2630613002/diff/1/components/sync/engine_impl...
File components/sync/engine_impl/uss_migrator.cc (right):

https://codereview.chromium.org/2630613002/diff/1/components/sync/engine_impl...
components/sync/engine_impl/uss_migrator.cc:106: // Ignore tombstones.
// Ignore tombstones because ...

https://codereview.chromium.org/2630613002/diff/1/components/sync/engine_impl...
components/sync/engine_impl/uss_migrator.cc:113:
worker->ProcessGetUpdatesResponse(progress, context, entity_ptrs, nullptr);
I forget, is this always going to result in a merge? Or is it possible the
bridge gets some of this as an apply?

[pavely, 2017-01-14 00:32:33]

lgtm

[maxbogue, 2017-01-17 21:09:45]

The CQ bit was checked by maxbogue@chromium.org

[maxbogue, 2017-01-17 21:09:49]

The CQ bit was unchecked by maxbogue@chromium.org

[maxbogue, 2017-01-17 22:01:41]

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

[maxbogue, 2017-01-17 22:02:27]

https://codereview.chromium.org/2630613002/diff/1/components/sync/engine_impl...
File components/sync/engine_impl/test_entry_factory.cc (right):

https://codereview.chromium.org/2630613002/diff/1/components/sync/engine_impl...
components/sync/engine_impl/test_entry_factory.cc:203: int64_t
TestEntryFactory::CreateTombstone(const std::string& name,
On 2017/01/13 16:31:23, skym wrote:
> It seems like there's a lot of duplicated logic between this and
> CreateSyncedItem. Is there a reason that consolidating this logic somewhere
> shared isn't easy?

Done.

https://codereview.chromium.org/2630613002/diff/1/components/sync/engine_impl...
File components/sync/engine_impl/uss_migrator.cc (right):

https://codereview.chromium.org/2630613002/diff/1/components/sync/engine_impl...
components/sync/engine_impl/uss_migrator.cc:106: // Ignore tombstones.
On 2017/01/13 16:31:23, skym wrote:
> // Ignore tombstones because ...

Done.

https://codereview.chromium.org/2630613002/diff/1/components/sync/engine_impl...
components/sync/engine_impl/uss_migrator.cc:113:
worker->ProcessGetUpdatesResponse(progress, context, entity_ptrs, nullptr);
On 2017/01/13 16:31:23, skym wrote:
> I forget, is this always going to result in a merge? Or is it possible the
> bridge gets some of this as an apply?

Always a merge due to the PassiveApplyUpdates call below.

[commit-bot: I haz the power, 2017-01-17 22:02:40]

Dry run: 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, 2017-01-17 22:22:25]

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

[commit-bot: I haz the power, 2017-01-17 22:22:25]

Dry run: Try jobs failed on following builders:
  ios-simulator on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios-simulator/bui...)

[maxbogue, 2017-01-17 22:45:24]

The CQ bit was checked by maxbogue@chromium.org

[maxbogue, 2017-01-17 22:45:24]

The patchset sent to the CQ was uploaded after l-g-t-m from skym@chromium.org,
pavely@chromium.org
Link to the patchset: https://codereview.chromium.org/2630613002/#ps40001
(title: "Fix PopulateEntry.")

[commit-bot: I haz the power, 2017-01-17 22:45:50]

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, 2017-01-17 23:05:43]

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

[commit-bot: I haz the power, 2017-01-17 23:05:44]

Try jobs failed on following builders:
  ios-simulator on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios-simulator/bui...)

[maxbogue, 2017-01-17 23:52:02]

The CQ bit was checked by maxbogue@chromium.org

[maxbogue, 2017-01-17 23:52:02]

The patchset sent to the CQ was uploaded after l-g-t-m from skym@chromium.org,
pavely@chromium.org
Link to the patchset: https://codereview.chromium.org/2630613002/#ps60001
(title: "Fix TestEntryFactory for realz.")

[commit-bot: I haz the power, 2017-01-17 23:52:24]

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, 2017-01-18 01:11:19]

CQ is committing da patch.

Bot data: {"patchset_id": 60001, "attempt_start_ts": 1484697122200580,
"parent_rev": "4775ad3772df99f3d60d2c55cecef016ded23f78", "commit_rev":
"23a04c49a42e8ddef2bcc9755f02038840409475"}

[commit-bot: I haz the power, 2017-01-18 01:13:03]

Description was changed from

==========
[Sync] USS: Filter out tombstones for initial sync.

Also prevents migration from sending tombstones.

BUG=680550
==========

to

==========
[Sync] USS: Filter out tombstones for initial sync.

Also prevents migration from sending tombstones.

BUG=680550

Review-Url: https://codereview.chromium.org/2630613002
Cr-Commit-Position: refs/heads/master@{#444219}
Committed:
https://chromium.googlesource.com/chromium/src/+/23a04c49a42e8ddef2bcc9755f02...
==========

[commit-bot: I haz the power, 2017-01-18 01:13:03]

Committed patchset #4 (id:60001) as
https://chromium.googlesource.com/chromium/src/+/23a04c49a42e8ddef2bcc9755f02...