diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-17 08:21:05 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-17 08:21:05 +0000 |
| commit | 35296fe1812b50829b1efea29aa70d6d300f20f7 (patch) | |
| tree | b0db9f4604c903776191ea14ecb9da0ee6b883d3 /net/tools | |
| parent | 74f566176e7b4b31c690ca039d1045d964dd9205 (diff) | |
| download | chromium_src-35296fe1812b50829b1efea29aa70d6d300f20f7.zip chromium_src-35296fe1812b50829b1efea29aa70d6d300f20f7.tar.gz chromium_src-35296fe1812b50829b1efea29aa70d6d300f20f7.tar.bz2 | |
[Sync] Add history delete directive type
Add new HISTORY_DELETE_DIRECTIVE model type. Update everything that
depends on model type.
Rename SyncCryptographer test to Cryptographer (since it's already in sync_unit_tests).
Add EncryptableUserTypes() function and use that instead of UserTypes() for
encryption-related stuff.
BUG=141245
TBR=jam@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10855037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162323 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/tools')
| -rw-r--r-- | net/tools/testserver/chromiumsync.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/net/tools/testserver/chromiumsync.py b/net/tools/testserver/chromiumsync.py index 4bc2d85..af3e59a 100644 --- a/net/tools/testserver/chromiumsync.py +++ b/net/tools/testserver/chromiumsync.py @@ -27,6 +27,7 @@ import bookmark_specifics_pb2 import get_updates_caller_info_pb2 import extension_setting_specifics_pb2 import extension_specifics_pb2 +import history_delete_directive_specifics_pb2 import nigori_specifics_pb2 import password_specifics_pb2 import preference_specifics_pb2 @@ -50,6 +51,7 @@ ALL_TYPES = ( AUTOFILL_PROFILE, BOOKMARK, EXTENSIONS, + HISTORY_DELETE_DIRECTIVE, NIGORI, PASSWORD, PREFERENCE, @@ -57,7 +59,7 @@ ALL_TYPES = ( SESSION, THEME, TYPED_URL, - EXTENSION_SETTINGS) = range(16) + EXTENSION_SETTINGS) = range(17) # An eumeration on the frequency at which the server should send errors # to the client. This would be specified by the url that triggers the error. @@ -82,6 +84,7 @@ SYNC_TYPE_TO_DESCRIPTOR = { BOOKMARK: SYNC_TYPE_FIELDS['bookmark'], EXTENSION_SETTINGS: SYNC_TYPE_FIELDS['extension_setting'], EXTENSIONS: SYNC_TYPE_FIELDS['extension'], + HISTORY_DELETE_DIRECTIVE: SYNC_TYPE_FIELDS['history_delete_directive'], NIGORI: SYNC_TYPE_FIELDS['nigori'], PASSWORD: SYNC_TYPE_FIELDS['password'], PREFERENCE: SYNC_TYPE_FIELDS['preference'], @@ -437,6 +440,10 @@ class SyncDataModel(object): parent_tag='google_chrome', sync_type=EXTENSION_SETTINGS), PermanentItem('google_chrome_extensions', name='Extensions', parent_tag='google_chrome', sync_type=EXTENSIONS), + PermanentItem('google_chrome_history_delete_directives', + name='History Delete Directives', + parent_tag='google_chrome', + sync_type=HISTORY_DELETE_DIRECTIVE), PermanentItem('google_chrome_passwords', name='Passwords', parent_tag='google_chrome', sync_type=PASSWORD), PermanentItem('google_chrome_search_engines', name='Search Engines', |