Reconcile the sync protos with the server-side version.
Reconcile the sync protos with the server-side version.

BUG=68572
TEST=none

Review URL: http://codereview.chromium.org/6461025

git-svn-id: http://src.chromium.org/svn/trunk/src@74335 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

Former-commit-id: abfc34d3f98139199118d6eab53614db87b28920
meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser