Prevent bookmarks from going out of sync part 2

Prevent bookmarks from going out of sync part 2

BUG=154964
Test=See bug

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=162363

[pkotwicz, 2012-10-09 16:20:47]

Scott and Nicolas, can you please take a look?

This fixes a scenario which can cause the bookmark favicons to be out of sync
which has been around for a while. (pre M23)
I will include a proper unittest once the favicon tests for
TwoClientBookmarksSyncTest are fixed.

[sky, 2012-10-09 17:47:20]

LGTM

[sky, 2012-10-09 17:47:44]

If things are out of sync, should we do a forced migration that dumps all?

[Nicolas Zea, 2012-10-09 18:30:57]

On 2012/10/09 17:47:44, sky wrote:
> If things are out of sync, should we do a forced migration that dumps all?

LGTM.

I don't think any forced action is necessary if things fall out of sync. On the
next restart, they should get back into sync via the model association (we'll
reconcile any favicon differences)

[commit-bot: I haz the power, 2012-10-10 01:17:00]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/pkotwicz@chromium.org/11099011/4001

[commit-bot: I haz the power, 2012-10-16 22:24:04]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/pkotwicz@chromium.org/11099011/12001

[commit-bot: I haz the power, 2012-10-17 11:14:51]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/pkotwicz@chromium.org/11099011/12001

[commit-bot: I haz the power, 2012-10-17 12:36:26]

Change committed as 162363