Index: net/tools/testserver/chromiumsync.py |
diff --git a/net/tools/testserver/chromiumsync.py b/net/tools/testserver/chromiumsync.py |
index 8e254823115a168501d54ea1db5c064f38b83355..6254e4dd95c4d87d3429b88e8692c38a5cc96b1d 100644 |
--- a/net/tools/testserver/chromiumsync.py |
+++ b/net/tools/testserver/chromiumsync.py |
@@ -31,6 +31,7 @@ import history_delete_directive_specifics_pb2 |
import nigori_specifics_pb2 |
import password_specifics_pb2 |
import preference_specifics_pb2 |
+import push_notification_specifics_pb2 |
import search_engine_specifics_pb2 |
import session_specifics_pb2 |
import sync_pb2 |
@@ -57,11 +58,12 @@ ALL_TYPES = ( |
NIGORI, |
PASSWORD, |
PREFERENCE, |
+ PUSH_NOTIFICATIONS, |
SEARCH_ENGINE, |
SESSION, |
THEME, |
TYPED_URL, |
- EXTENSION_SETTINGS) = range(19) |
+ EXTENSION_SETTINGS) = range(20) |
# 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. |
@@ -92,6 +94,7 @@ SYNC_TYPE_TO_DESCRIPTOR = { |
NIGORI: SYNC_TYPE_FIELDS['nigori'], |
PASSWORD: SYNC_TYPE_FIELDS['password'], |
PREFERENCE: SYNC_TYPE_FIELDS['preference'], |
+ PUSH_NOTIFICATIONS: SYNC_TYPE_FIELDS["push_notifications"], |
SEARCH_ENGINE: SYNC_TYPE_FIELDS['search_engine'], |
SESSION: SYNC_TYPE_FIELDS['session'], |
THEME: SYNC_TYPE_FIELDS['theme'], |
@@ -463,6 +466,8 @@ class SyncDataModel(object): |
parent_tag=ROOT_ID, sync_type=PASSWORD), |
PermanentItem('google_chrome_preferences', name='Preferences', |
parent_tag=ROOT_ID, sync_type=PREFERENCE), |
+ PermanentItem('google_chrome_preferences', name='Push Notifications', |
+ parent_tag=ROOT_ID, sync_type=PREFERENCE), |
PermanentItem('google_chrome_search_engines', name='Search Engines', |
parent_tag=ROOT_ID, sync_type=SEARCH_ENGINE), |
PermanentItem('google_chrome_sessions', name='Sessions', |