[Sync] Add two more USS integration tests.

[Sync] Add two more USS integration tests.

- Disabling and enabling the type, which revealed a bug in the DTC.
- Conflict resolution, which revealed a bug in the worker.

BUG=643269
Committed: https://crrev.com/45763c93428ccabb847d00c35f14c5e33e0e0c0e
Cr-Commit-Position: refs/heads/master@{#419222}

[maxbogue, 2016-09-16 00:34:30]

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

[commit-bot: I haz the power, 2016-09-16 00:35:00]

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

[maxbogue, 2016-09-16 01:16:44]

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

[maxbogue, 2016-09-16 01:16:44]

Pavel, Sky, PTAL!

[commit-bot: I haz the power, 2016-09-16 01:41:01]

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

[commit-bot: I haz the power, 2016-09-16 01:41:02]

Dry run: This issue passed the CQ dry run.

[pavely, 2016-09-16 16:11:08]

lgtm

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

https://codereview.chromium.org/2339403004/diff/1/components/sync/engine_impl...
components/sync/engine_impl/worker_entity_tracker.cc:133: id_ =
update.entity->id;
Could you adjust comment for entities_ in model_type_worker.h to mention that
the map is keyed by client tag hash. This way it will be easier to verify that
adjusting id_ will not break mapping. Also we could make
WorkerEntityTracker::client_tag_hash_ const, this way attempt to modify it will
cause compiler error.

[maxbogue, 2016-09-16 17:39:43]

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

https://codereview.chromium.org/2339403004/diff/1/components/sync/engine_impl...
components/sync/engine_impl/worker_entity_tracker.cc:133: id_ =
update.entity->id;
On 2016/09/16 16:11:08, pavely wrote:
> Could you adjust comment for entities_ in model_type_worker.h to mention that
> the map is keyed by client tag hash. This way it will be easier to verify that
> adjusting id_ will not break mapping. Also we could make
> WorkerEntityTracker::client_tag_hash_ const, this way attempt to modify it
will
> cause compiler error.

Done and done.

[maxbogue, 2016-09-16 17:39:47]

The CQ bit was checked by maxbogue@chromium.org

[maxbogue, 2016-09-16 17:39:47]

The patchset sent to the CQ was uploaded after l-g-t-m from pavely@chromium.org
Link to the patchset: https://codereview.chromium.org/2339403004/#ps20001
(title: "Address comments.")

[commit-bot: I haz the power, 2016-09-16 17:40:08]

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-09-16 18:29:14]

Committed patchset #2 (id:20001)

[commit-bot: I haz the power, 2016-09-16 18:32:24]

Description was changed from

==========
[Sync] Add two more USS integration tests.

- Disabling and enabling the type, which revealed a bug in the DTC.
- Conflict resolution, which revealed a bug in the worker.

BUG=643269
==========

to

==========
[Sync] Add two more USS integration tests.

- Disabling and enabling the type, which revealed a bug in the DTC.
- Conflict resolution, which revealed a bug in the worker.

BUG=643269

Committed: https://crrev.com/45763c93428ccabb847d00c35f14c5e33e0e0c0e
Cr-Commit-Position: refs/heads/master@{#419222}
==========

[commit-bot: I haz the power, 2016-09-16 18:32:25]

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