diff options
| author | wittman <wittman@chromium.org> | 2014-10-28 13:42:51 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-28 20:43:19 +0000 |
| commit | a8c6b5e30dee463e2feaa44fb2554859c77c3db6 (patch) | |
| tree | 3971560aa6916083dff7ce7c50751912a50be1be /sync/tools | |
| parent | 674e6a9f4dedcdd16530f3b5d99714a0595ab1c9 (diff) | |
| download | chromium_src-a8c6b5e30dee463e2feaa44fb2554859c77c3db6.zip chromium_src-a8c6b5e30dee463e2feaa44fb2554859c77c3db6.tar.gz chromium_src-a8c6b5e30dee463e2feaa44fb2554859c77c3db6.tar.bz2 | |
Revert enhanced bookmarks sync datatype
We'd like to move to a new sync datatype like this, but there's
not an effective way to do it while supporting existing
encrypted bookmarks users. We'll eventually get there by
extending BookmarkSpecifics to do what we need, then
reintroducing the new type and converting client-side once
feasible for all clients.
By the time we're ready to reintroduce the new type many things
will likely have changed, so just remove it for the time being.
This reverts commit 72520cfbda25e457da26113b568c76171d716a3f.
BUG=427727
Review URL: https://codereview.chromium.org/673983003
Cr-Commit-Position: refs/heads/master@{#301703}
Diffstat (limited to 'sync/tools')
| -rw-r--r-- | sync/tools/testserver/chromiumsync.py | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/sync/tools/testserver/chromiumsync.py b/sync/tools/testserver/chromiumsync.py index 2dcee1b..2930059 100644 --- a/sync/tools/testserver/chromiumsync.py +++ b/sync/tools/testserver/chromiumsync.py @@ -33,7 +33,6 @@ import bookmark_specifics_pb2 import client_commands_pb2 import dictionary_specifics_pb2 import get_updates_caller_info_pb2 -import enhanced_bookmark_specifics_pb2 import extension_setting_specifics_pb2 import extension_specifics_pb2 import favicon_image_specifics_pb2 @@ -73,7 +72,6 @@ ALL_TYPES = ( BOOKMARK, DEVICE_INFO, DICTIONARY, - ENHANCED_BOOKMARK, EXPERIMENTS, EXTENSIONS, HISTORY_DELETE_DIRECTIVE, @@ -92,7 +90,7 @@ ALL_TYPES = ( TYPED_URL, EXTENSION_SETTINGS, FAVICON_IMAGES, - FAVICON_TRACKING) = range(31) + FAVICON_TRACKING) = range(30) # An enumeration on the frequency at which the server should send errors # to the client. This would be specified by the url that triggers the error. @@ -119,7 +117,6 @@ SYNC_TYPE_TO_DESCRIPTOR = { BOOKMARK: SYNC_TYPE_FIELDS['bookmark'], DEVICE_INFO: SYNC_TYPE_FIELDS['device_info'], DICTIONARY: SYNC_TYPE_FIELDS['dictionary'], - ENHANCED_BOOKMARK: SYNC_TYPE_FIELDS['enhanced_bookmark'], EXPERIMENTS: SYNC_TYPE_FIELDS['experiments'], EXTENSION_SETTINGS: SYNC_TYPE_FIELDS['extension_setting'], EXTENSIONS: SYNC_TYPE_FIELDS['extension'], @@ -512,9 +509,6 @@ class SyncDataModel(object): parent_tag=ROOT_ID, sync_type=AUTOFILL_PROFILE), PermanentItem('google_chrome_device_info', name='Device Info', parent_tag=ROOT_ID, sync_type=DEVICE_INFO), - PermanentItem('google_chrome_enhanced_bookmarks', - name='Enhanced_Bookmarks', - parent_tag=ROOT_ID, sync_type=ENHANCED_BOOKMARK), PermanentItem('google_chrome_experiments', name='Experiments', parent_tag=ROOT_ID, sync_type=EXPERIMENTS), PermanentItem('google_chrome_extension_settings', |