[Sync] Move conflict resolution test code to FakeModelTypeService.

[Sync] Move conflict resolution test code to FakeModelTypeService.

This way it can be shared by the integration tests and they become more
readable.

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

[maxbogue, 2016-09-26 17:57:00]

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

[commit-bot: I haz the power, 2016-09-26 17:57:20]

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-26 17:59:03]

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

[commit-bot: I haz the power, 2016-09-26 17:59:32]

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-26 18:04:25]

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

[maxbogue, 2016-09-26 18:04:26]

Sky, PTAL!

[skym, 2016-09-26 18:16:04]

lgtm

https://codereview.chromium.org/2369103002/diff/20001/chrome/browser/sync/tes...
File chrome/browser/sync/test/integration/two_client_uss_sync_test.cc (right):

https://codereview.chromium.org/2369103002/diff/20001/chrome/browser/sync/tes...
chrome/browser/sync/test/integration/two_client_uss_sync_test.cc:28: const char
kResolutionValue[] = "RESOLVED";
Why not use kValue3[]? I thought kResolutionValue was some special resolution
enum at first.

https://codereview.chromium.org/2369103002/diff/20001/chrome/browser/sync/tes...
chrome/browser/sync/test/integration/two_client_uss_sync_test.cc:293:
FakeModelTypeService::GenerateEntityData(kKey1, kResolutionValue)));
Should you write a test where they disagree?

https://codereview.chromium.org/2369103002/diff/20001/components/sync/api/fak...
File components/sync/api/fake_model_type_service.h (right):

https://codereview.chromium.org/2369103002/diff/20001/components/sync/api/fak...
components/sync/api/fake_model_type_service.h:121: void
SetConflictResolution(ConflictResolution resolution);
This doesn't really handle scenarios where you have more than 1 conflict. I
suppose in that case though, you can still overwrite the ResolveConflict method.

[commit-bot: I haz the power, 2016-09-26 19:13:24]

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

[commit-bot: I haz the power, 2016-09-26 19:13:25]

Dry run: This issue passed the CQ dry run.

[maxbogue, 2016-09-27 16:26:12]

https://codereview.chromium.org/2369103002/diff/20001/chrome/browser/sync/tes...
File chrome/browser/sync/test/integration/two_client_uss_sync_test.cc (right):

https://codereview.chromium.org/2369103002/diff/20001/chrome/browser/sync/tes...
chrome/browser/sync/test/integration/two_client_uss_sync_test.cc:28: const char
kResolutionValue[] = "RESOLVED";
On 2016/09/26 18:16:04, skym wrote:
> Why not use kValue3[]? I thought kResolutionValue was some special resolution
> enum at first.

Hmm yeah that makes more sense now that it's set in the test. Done.

https://codereview.chromium.org/2369103002/diff/20001/chrome/browser/sync/tes...
chrome/browser/sync/test/integration/two_client_uss_sync_test.cc:293:
FakeModelTypeService::GenerateEntityData(kKey1, kResolutionValue)));
On 2016/09/26 18:16:04, skym wrote:
> Should you write a test where they disagree?

I've run into some strange issues trying to add a second round of things and
I'll be investigating that separately.

https://codereview.chromium.org/2369103002/diff/20001/components/sync/api/fak...
File components/sync/api/fake_model_type_service.h (right):

https://codereview.chromium.org/2369103002/diff/20001/components/sync/api/fak...
components/sync/api/fake_model_type_service.h:121: void
SetConflictResolution(ConflictResolution resolution);
On 2016/09/26 18:16:04, skym wrote:
> This doesn't really handle scenarios where you have more than 1 conflict. I
> suppose in that case though, you can still overwrite the ResolveConflict
method.

Yeah, exactly. Also it sticks around for anything but USE_NEW resolutions...
it's all a bit hacky because ResolveConflict is const :S

[maxbogue, 2016-09-27 16:26:17]

The CQ bit was checked by maxbogue@chromium.org

[maxbogue, 2016-09-27 16:26:17]

The patchset sent to the CQ was uploaded after l-g-t-m from skym@chromium.org
Link to the patchset: https://codereview.chromium.org/2369103002/#ps40001
(title: "Address comment.")

[commit-bot: I haz the power, 2016-09-27 16:26: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, 2016-09-27 17:05:57]

Committed patchset #3 (id:40001)

[commit-bot: I haz the power, 2016-09-27 17:08:11]

Description was changed from

==========
[Sync] Move conflict resolution test code to FakeModelTypeService.

This way it can be shared by the integration tests and they become more
readable.

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

to

==========
[Sync] Move conflict resolution test code to FakeModelTypeService.

This way it can be shared by the integration tests and they become more
readable.

BUG=643269

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

[commit-bot: I haz the power, 2016-09-27 17:08:12]

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