[Sync] Test local bookmark sync on Android, take 2
commit318bbb567beb8c01ebd3c94b3141471174173d21
authormaxbogue <maxbogue@chromium.org>
Thu, 4 Jun 2015 22:54:17 +0000 (4 15:54 -0700)
committerCommit bot <commit-bot@chromium.org>
Thu, 4 Jun 2015 22:55:05 +0000 (4 22:55 +0000)
tree901943672fc1006afb5c40cefa08580ead3011e7
parent26daa3e90c9e527582edaae3d1c6fc08c293d33b
[Sync] Test local bookmark sync on Android, take 2

This is a reland of http://crrev.com/1151833003, which was missing a DEPS fix.

Adds testUploadModifyAndDeleteBookmark. Also merges testDownloadBookmark and testDownloadDeletedBookmark into testDownloadAndDeleteBookmark.

This change also pulls the JSON parts out into getClientBookmarks in order to simplify the test case code.

BUG=480604

Review URL: https://codereview.chromium.org/1158893003

Cr-Commit-Position: refs/heads/master@{#332952}
chrome/android/sync_shell/javatests/DEPS
chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/BookmarksTest.java