Add ManagedUserSettings Sync data type.

sync/tools/testserver/chromiumsync.py

Index: sync/tools/testserver/chromiumsync.py
diff --git a/sync/tools/testserver/chromiumsync.py b/sync/tools/testserver/chromiumsync.py
index eecea5c9254978c74c568322354af7f2b08018cc..fbd3c5b6c2305e9444254a24eead674ec7c84336 100644
--- a/sync/tools/testserver/chromiumsync.py
+++ b/sync/tools/testserver/chromiumsync.py
@@ -31,6 +31,7 @@ import extension_specifics_pb2
 import favicon_image_specifics_pb2
 import favicon_tracking_specifics_pb2
 import history_delete_directive_specifics_pb2
+import managed_user_setting_specifics_pb2
 import nigori_specifics_pb2
 import password_specifics_pb2
 import preference_specifics_pb2
@@ -60,6 +61,7 @@ ALL_TYPES = (
     EXPERIMENTS,
     EXTENSIONS,
     HISTORY_DELETE_DIRECTIVE,
+    MANAGED_USER_SETTING,
     NIGORI,
     PASSWORD,
     PREFERENCE,
@@ -71,7 +73,7 @@ ALL_TYPES = (
     TYPED_URL,
     EXTENSION_SETTINGS,
     FAVICON_IMAGES,
-    FAVICON_TRACKING) = range(24)
+    FAVICON_TRACKING) = range(25)
 
 # 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.
@@ -102,6 +104,7 @@ SYNC_TYPE_TO_DESCRIPTOR = {
     FAVICON_IMAGES: SYNC_TYPE_FIELDS['favicon_image'],
     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'],
     NIGORI: SYNC_TYPE_FIELDS['nigori'],
     PASSWORD: SYNC_TYPE_FIELDS['password'],
     PREFERENCE: SYNC_TYPE_FIELDS['preference'],
@@ -491,6 +494,9 @@ class SyncDataModel(object):
                     name='Favicon Tracking',
                     parent_tag=ROOT_ID,
                     sync_type=FAVICON_TRACKING),
+      PermanentItem('google_chrome_managed_user_settings',
+                    name='Managed User Settings',
+                    parent_tag=ROOT_ID, sync_type=MANAGED_USER_SETTING),
       PermanentItem('google_chrome_nigori', name='Nigori',
                     parent_tag=ROOT_ID, sync_type=NIGORI),
       PermanentItem('google_chrome_passwords', name='Passwords',