Enable ReconcileWhenWhenBothPrefsTypesArrivesFromSync on iOS

Enable ReconcileWhenWhenBothPrefsTypesArrivesFromSync on iOS

This CL enables PasswordManagerSettingMigratorServiceTest.ReconcileWhenWhenBothPrefsTypesArrivesFromSync on iOS, after https://codereview.chromium.org/1902113002/ fixed the test failure.

BUG=604721
Committed: https://crrev.com/5760870a55360f410f3327597a1da57d1d806119
Cr-Commit-Position: refs/heads/master@{#388476}

[vabr (Chromium), 2016-04-20 10:27:16]

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

[commit-bot: I haz the power, 2016-04-20 10:27:28]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1902093005/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1902093005/1

[commit-bot: I haz the power, 2016-04-20 10:58:12]

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

[commit-bot: I haz the power, 2016-04-20 10:58:13]

Dry run: This issue passed the CQ dry run.

[sdefresne, 2016-04-20 12:25:09]

sdefresne@chromium.org changed reviewers:
+ sdefresne@chromium.org

[sdefresne, 2016-04-20 12:25:09]

lgtm

[vabr (Chromium), 2016-04-20 12:40:20]

The CQ bit was checked by vabr@chromium.org

[commit-bot: I haz the power, 2016-04-20 12:40:34]

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

[commit-bot: I haz the power, 2016-04-20 12:45:00]

Committed patchset #1 (id:1)

[commit-bot: I haz the power, 2016-04-22 19:22:47]

Description was changed from

==========
Enable ReconcileWhenWhenBothPrefsTypesArrivesFromSync on iOS

This CL enables
PasswordManagerSettingMigratorServiceTest.ReconcileWhenWhenBothPrefsTypesArrivesFromSync
on iOS, after https://codereview.chromium.org/1902113002/ fixed the test
failure.

BUG=604721
==========

to

==========
Enable ReconcileWhenWhenBothPrefsTypesArrivesFromSync on iOS

This CL enables
PasswordManagerSettingMigratorServiceTest.ReconcileWhenWhenBothPrefsTypesArrivesFromSync
on iOS, after https://codereview.chromium.org/1902113002/ fixed the test
failure.

BUG=604721

Committed: https://crrev.com/5760870a55360f410f3327597a1da57d1d806119
Cr-Commit-Position: refs/heads/master@{#388476}
==========

[commit-bot: I haz the power, 2016-04-22 19:22:47]

Patchset 1 (id:??) landed as
https://crrev.com/5760870a55360f410f3327597a1da57d1d806119
Cr-Commit-Position: refs/heads/master@{#388476}