summaryrefslogtreecommitdiffstats
path: root/sync/tools
diff options
context:
space:
mode:
authorbauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-24 09:20:39 +0000
committerbauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-24 09:20:39 +0000
commit42e89030ac3293414aa3c3e71994015a2f7d76f8 (patch)
treec92f871031fd5afc2b40ee6cb317e582b2cbaa84 /sync/tools
parentd5e04ce616faf38eaae56c9c49f802aa672405ec (diff)
downloadchromium_src-42e89030ac3293414aa3c3e71994015a2f7d76f8.zip
chromium_src-42e89030ac3293414aa3c3e71994015a2f7d76f8.tar.gz
chromium_src-42e89030ac3293414aa3c3e71994015a2f7d76f8.tar.bz2
Add Sync data type for managed users.
TBR=atwilson@chromium.org BUG=228833 Review URL: https://chromiumcodereview.appspot.com/15177003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202026 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/tools')
-rw-r--r--sync/tools/testserver/chromiumsync.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/sync/tools/testserver/chromiumsync.py b/sync/tools/testserver/chromiumsync.py
index fbd3c5b..af43415 100644
--- a/sync/tools/testserver/chromiumsync.py
+++ b/sync/tools/testserver/chromiumsync.py
@@ -32,6 +32,7 @@ import favicon_image_specifics_pb2
import favicon_tracking_specifics_pb2
import history_delete_directive_specifics_pb2
import managed_user_setting_specifics_pb2
+import managed_user_specifics_pb2
import nigori_specifics_pb2
import password_specifics_pb2
import preference_specifics_pb2
@@ -62,6 +63,7 @@ ALL_TYPES = (
EXTENSIONS,
HISTORY_DELETE_DIRECTIVE,
MANAGED_USER_SETTING,
+ MANAGED_USER,
NIGORI,
PASSWORD,
PREFERENCE,
@@ -73,7 +75,7 @@ ALL_TYPES = (
TYPED_URL,
EXTENSION_SETTINGS,
FAVICON_IMAGES,
- FAVICON_TRACKING) = range(25)
+ FAVICON_TRACKING) = range(26)
# 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.
@@ -105,6 +107,7 @@ SYNC_TYPE_TO_DESCRIPTOR = {
FAVICON_TRACKING: SYNC_TYPE_FIELDS['favicon_tracking'],
HISTORY_DELETE_DIRECTIVE: SYNC_TYPE_FIELDS['history_delete_directive'],
MANAGED_USER_SETTING: SYNC_TYPE_FIELDS['managed_user_setting'],
+ MANAGED_USER: SYNC_TYPE_FIELDS['managed_user'],
NIGORI: SYNC_TYPE_FIELDS['nigori'],
PASSWORD: SYNC_TYPE_FIELDS['password'],
PREFERENCE: SYNC_TYPE_FIELDS['preference'],
@@ -497,6 +500,9 @@ class SyncDataModel(object):
PermanentItem('google_chrome_managed_user_settings',
name='Managed User Settings',
parent_tag=ROOT_ID, sync_type=MANAGED_USER_SETTING),
+ PermanentItem('google_chrome_managed_users',
+ name='Managed Users',
+ parent_tag=ROOT_ID, sync_type=MANAGED_USER),
PermanentItem('google_chrome_nigori', name='Nigori',
parent_tag=ROOT_ID, sync_type=NIGORI),
PermanentItem('google_chrome_passwords', name='Passwords',