commit 65bc98961e433c83a3d273b9ce800c98c8c73cca
author Mike West <mkwst@chromium.org> Fri Sep 29 09:28:17 2017
committer Commit Bot <commit-bot@chromium.org> Fri Sep 29 09:28:17 2017
tree fc3b341f10abc9ad52dd83a99a854ce90f1307e1
parent d6ae0d9cc19790a63968b2d6b1b7f1f2f80fcd1e

Revert "ChromeOS: Enable ShelfModel synchronization by default."

This reverts commit 19e812ea87584b317f576ae91112bb4401cefb1b.

Reason for revert:

Starting in https://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Tests%20%281%29/builds/45183, `AppListTest.PressAppListButtonToShowAndDismiss` has been failing. It
doesn't look like the result of that test should have changed, 
reverting so folks who know what they're doing can have a look. :)

Original change's description:
> ChromeOS: Enable ShelfModel synchronization by default.
> 
> Synchronize two ShelfModels between Ash and Chrome by default.
> Can be disabled for debugging/testing in classic ash:
>   --ash-disable-shelf-model-synchronization
>   "Disable shelf model synchronization" (in about:flags)
> 
> Bug: 557406
> Test: No Chrome OS shelf behavior changes; please file any bugs!
> Change-Id: I47c7c7b6c9d38f9aaa4ea89a1dc8ce333e49f8bd
> Reviewed-on: https://chromium-review.googlesource.com/682340
> Commit-Queue: Michael Wasserman <msw@chromium.org>
> Reviewed-by: James Cook <jamescook@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#505317}

TBR=jamescook@chromium.org,msw@chromium.org

Change-Id: Idcc1058f4b11a2ebc491f4c168e073692cd16910
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 557406, 770138
Reviewed-on: https://chromium-review.googlesource.com/691816
Commit-Queue: Mike West <mkwst@chromium.org>
Reviewed-by: Mike West <mkwst@chromium.org>
Cr-Commit-Position: refs/heads/master@{#505336}