diff options
| author | quiche <quiche@chromium.org> | 2014-10-30 14:32:38 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-30 21:32:56 +0000 |
| commit | dfad17b4d9648cfa189f36b8c156d7296582bcfa (patch) | |
| tree | 4c62a752d6a98623edc79c121bf2de1119da6296 /sync/tools | |
| parent | 00dc0d43eac8002ab5e1bc5fe44ce4119ce4aca4 (diff) | |
| download | chromium_src-dfad17b4d9648cfa189f36b8c156d7296582bcfa.zip chromium_src-dfad17b4d9648cfa189f36b8c156d7296582bcfa.tar.gz chromium_src-dfad17b4d9648cfa189f36b8c156d7296582bcfa.tar.bz2 | |
sync: add WIFI_CREDENTIALS protobuf, ModelType, and preference
- add a protobuf for WiFi credentials
- add a ModelType for syncing WiFi credentials
- add UI for controlling whether or not WiFi credentials are synced
- add new data type to testserver
While there:
- update comment in sync_setup_overlay.js
- fix ordering of arguments to EXPECT_EQ in CheckBool
(sync_setup_handler_unittest)
- move GetSelectableTypeNameMap from sync_setup_handler.cc to model_type.cc
BUG=chromium:422045
TEST=ProfileSync, SyncSetup, SyncModel, ModelType, NigoriUtil,
ProtoEnumConversions, ProtoValueConversions,
SyncEncryptionHandlerImpl
Review URL: https://codereview.chromium.org/674633002
Cr-Commit-Position: refs/heads/master@{#302159}
Diffstat (limited to 'sync/tools')
| -rw-r--r-- | sync/tools/testserver/chromiumsync.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sync/tools/testserver/chromiumsync.py b/sync/tools/testserver/chromiumsync.py index 2930059..5487ef2 100644 --- a/sync/tools/testserver/chromiumsync.py +++ b/sync/tools/testserver/chromiumsync.py @@ -55,6 +55,7 @@ import synced_notification_render_pb2 import synced_notification_specifics_pb2 import theme_specifics_pb2 import typed_url_specifics_pb2 +import wifi_credential_specifics_pb2 # An enumeration of the various kinds of data that can be synced. # Over the wire, this enumeration is not used: a sync object's type is @@ -90,7 +91,8 @@ ALL_TYPES = ( TYPED_URL, EXTENSION_SETTINGS, FAVICON_IMAGES, - FAVICON_TRACKING) = range(30) + FAVICON_TRACKING, + WIFI_CREDENTIAL) = range(31) # 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. @@ -138,6 +140,7 @@ SYNC_TYPE_TO_DESCRIPTOR = { SYNC_TYPE_FIELDS["synced_notification_app_info"], THEME: SYNC_TYPE_FIELDS['theme'], TYPED_URL: SYNC_TYPE_FIELDS['typed_url'], + WIFI_CREDENTIAL: SYNC_TYPE_FIELDS["wifi_credential"], } # The parent ID used to indicate a top-level node. @@ -560,6 +563,8 @@ class SyncDataModel(object): parent_tag=ROOT_ID, sync_type=THEME), PermanentItem('google_chrome_typed_urls', name='Typed URLs', parent_tag=ROOT_ID, sync_type=TYPED_URL), + PermanentItem('google_chrome_wifi_credentials', name='WiFi Credentials', + parent_tag=ROOT_ID, sync_type=WIFI_CREDENTIAL), PermanentItem('google_chrome_dictionary', name='Dictionary', parent_tag=ROOT_ID, sync_type=DICTIONARY), PermanentItem('google_chrome_articles', name='Articles', |