[Sync] Fix mobile bookmark folder association on non-android

[Sync] Fix mobile bookmark folder association on non-android

We were failing to associate the mobile bookmarks folder at sync startup time.
This could result in various seemingly-random bookmark unrecoverable errors.
We now associate the bookmark folder if it's there, and condition triggering
an association error on whether we expected it to be there (which we only do
on ANDROID platforms).

BUG=121587
TEST=Sign in to sync with a clean profile, but synced mobile bookmarks existing
in the mobile bookmarks folder on the server. Bookmarks should appear on the
desktop client.


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

[Nicolas Zea, 2012-08-10 23:26:08]

PTAL

[tim (not reviewing), 2012-08-10 23:31:22]

http://codereview.chromium.org/10828268/diff/6001/chrome/browser/sync/glue/bo...
File chrome/browser/sync/glue/bookmark_model_associator.cc (right):

http://codereview.chromium.org/10828268/diff/6001/chrome/browser/sync/glue/bo...
chrome/browser/sync/glue/bookmark_model_associator.cc:412: else
The 'else' isn't really necessary here.  Lets just reset 'error'.

[tim (not reviewing), 2012-08-10 23:31:31]

On 2012/08/10 23:31:22, timsteele wrote:
>
http://codereview.chromium.org/10828268/diff/6001/chrome/browser/sync/glue/bo...
> File chrome/browser/sync/glue/bookmark_model_associator.cc (right):
> 
>
http://codereview.chromium.org/10828268/diff/6001/chrome/browser/sync/glue/bo...
> chrome/browser/sync/glue/bookmark_model_associator.cc:412: else
> The 'else' isn't really necessary here.  Lets just reset 'error'.

LGTM after that

[commit-bot: I haz the power, 2012-08-10 23:33:40]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/zea@chromium.org/10828268/10001

[commit-bot: I haz the power, 2012-08-11 01:51:32]

Change committed as 151178