[Sync] USS: Ignore encryption changes during conflict resolution 1/2

[Sync] USS: Ignore encryption changes during conflict resolution 1/2

This change introduces the base_specifics_hash field of EntityMetadata
and uses it to detect local and remote encryption changes that can be
ignored during conflict resolution.

Part 2 will plumb the specifics_hash through the worker and commit
contribution so it can be returned in the CommitResponseData.

BUG=605708
Committed: https://crrev.com/b964f3529773bd679d5604ac83f4ed367a60bb2c
Cr-Commit-Position: refs/heads/master@{#390133}

[maxbogue, 2016-04-26 16:42:17]

Description was changed from

==========
[Sync] USS: Ignore encryption changes during conflict resolution 1/2

This change introduces the base_specifics_hash field of EntityMetadata
and uses it to detect local and remote encryption changes that can be
ignored during conflict resolution.

BUG=605708
==========

to

==========
[Sync] USS: Ignore encryption changes during conflict resolution 1/2

This change introduces the base_specifics_hash field of EntityMetadata
and uses it to detect local and remote encryption changes that can be
ignored during conflict resolution.

Part 2 will plumb the specifics_hash through the worker and commit
contribution so it can be returned in the CommitResponseData.

BUG=605708
==========

[maxbogue, 2016-04-26 16:42:39]

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

[maxbogue, 2016-04-26 16:42:40]

PTAL!

[pavely, 2016-04-26 20:59:39]

lgtm with comment.

https://codereview.chromium.org/1918923002/diff/1/sync/internal_api/processor...
File sync/internal_api/processor_entity_tracker_unittest.cc (right):

https://codereview.chromium.org/1918923002/diff/1/sync/internal_api/processor...
sync/internal_api/processor_entity_tracker_unittest.cc:42: }
nit: new line before second } and add "  // namespace"

https://codereview.chromium.org/1918923002/diff/1/sync/internal_api/processor...
sync/internal_api/processor_entity_tracker_unittest.cc:176:
EXPECT_TRUE(entity->metadata().base_specifics_hash().empty());
Consider adding test for calling MakeLocalChange multiple times and verifying
that base_specifics_hash is preserved.
Also test for receiving not up-to-date Commit response and ensuring that
base_specifics_hash is updated correctly.

https://codereview.chromium.org/1918923002/diff/1/sync/internal_api/public/pr...
File sync/internal_api/public/processor_entity_tracker.h (right):

https://codereview.chromium.org/1918923002/diff/1/sync/internal_api/public/pr...
sync/internal_api/public/processor_entity_tracker.h:118: // server) metadata.
Replace "metadata" with "data" or "specifics".

[maxbogue, 2016-04-27 17:28:53]

https://codereview.chromium.org/1918923002/diff/1/sync/internal_api/processor...
File sync/internal_api/processor_entity_tracker_unittest.cc (right):

https://codereview.chromium.org/1918923002/diff/1/sync/internal_api/processor...
sync/internal_api/processor_entity_tracker_unittest.cc:42: }
On 2016/04/26 20:59:39, pavely wrote:
> nit: new line before second } and add "  // namespace"

Done.

https://codereview.chromium.org/1918923002/diff/1/sync/internal_api/processor...
sync/internal_api/processor_entity_tracker_unittest.cc:176:
EXPECT_TRUE(entity->metadata().base_specifics_hash().empty());
On 2016/04/26 20:59:39, pavely wrote:
> Consider adding test for calling MakeLocalChange multiple times and verifying
> that base_specifics_hash is preserved.
> Also test for receiving not up-to-date Commit response and ensuring that
> base_specifics_hash is updated correctly. 

As discussed offline, I will be adding these in my upcoming
ProcessorEntityTrackerTest CL.

https://codereview.chromium.org/1918923002/diff/1/sync/internal_api/public/pr...
File sync/internal_api/public/processor_entity_tracker.h (right):

https://codereview.chromium.org/1918923002/diff/1/sync/internal_api/public/pr...
sync/internal_api/public/processor_entity_tracker.h:118: // server) metadata.
On 2016/04/26 20:59:39, pavely wrote:
> Replace "metadata" with "data" or "specifics".

Went with "specifics hash".

[maxbogue, 2016-04-27 17:29:39]

The CQ bit was checked by maxbogue@chromium.org

[maxbogue, 2016-04-27 17:29:39]

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/1918923002/#ps20001
(title: "Address comments.")

[commit-bot: I haz the power, 2016-04-27 17:30:10]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1918923002/20001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1918923002/20001

[commit-bot: I haz the power, 2016-04-27 18:24:43]

Description was changed from

==========
[Sync] USS: Ignore encryption changes during conflict resolution 1/2

This change introduces the base_specifics_hash field of EntityMetadata
and uses it to detect local and remote encryption changes that can be
ignored during conflict resolution.

Part 2 will plumb the specifics_hash through the worker and commit
contribution so it can be returned in the CommitResponseData.

BUG=605708
==========

to

==========
[Sync] USS: Ignore encryption changes during conflict resolution 1/2

This change introduces the base_specifics_hash field of EntityMetadata
and uses it to detect local and remote encryption changes that can be
ignored during conflict resolution.

Part 2 will plumb the specifics_hash through the worker and commit
contribution so it can be returned in the CommitResponseData.

BUG=605708
==========

[commit-bot: I haz the power, 2016-04-27 18:24:44]

Committed patchset #2 (id:20001)

[commit-bot: I haz the power, 2016-04-30 17:11:26]

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

[commit-bot: I haz the power, 2016-04-30 17:50:59]

Description was changed from

==========
[Sync] USS: Ignore encryption changes during conflict resolution 1/2

This change introduces the base_specifics_hash field of EntityMetadata
and uses it to detect local and remote encryption changes that can be
ignored during conflict resolution.

Part 2 will plumb the specifics_hash through the worker and commit
contribution so it can be returned in the CommitResponseData.

BUG=605708
==========

to

==========
[Sync] USS: Ignore encryption changes during conflict resolution 1/2

This change introduces the base_specifics_hash field of EntityMetadata
and uses it to detect local and remote encryption changes that can be
ignored during conflict resolution.

Part 2 will plumb the specifics_hash through the worker and commit
contribution so it can be returned in the CommitResponseData.

BUG=605708

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

[skym, 2016-05-04 14:48:04]

lgtm

[skym, 2016-05-04 14:48:26]

On 2016/05/04 14:48:04, skym wrote:
> lgtm

Whoops, wrong CL.