summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorrsimha@chromium.org <rsimha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-10 22:59:59 +0000
committerrsimha@chromium.org <rsimha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-10 22:59:59 +0000
commitcacc3d66d1fe90511de178c1041f0897f9eb9833 (patch)
tree89d707c0149ab06ae2c759d493ceece72dff47e3 /net
parentff51fb8b1d1be70c6fb74d1a9d015477ec4d2e5b (diff)
downloadchromium_src-cacc3d66d1fe90511de178c1041f0897f9eb9833.zip
chromium_src-cacc3d66d1fe90511de178c1041f0897f9eb9833.tar.gz
chromium_src-cacc3d66d1fe90511de178c1041f0897f9eb9833.tar.bz2
Adding new sync data type AUTOFILL_PROFILE to python server.
This patch updates the python sync server implementation with the newly added AUTOFILL_PROFILE sync data type. BUG=69127 TEST=sync_integration_tests Review URL: http://codereview.chromium.org/6096010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70954 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rwxr-xr-xnet/tools/testserver/chromiumsync.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/net/tools/testserver/chromiumsync.py b/net/tools/testserver/chromiumsync.py
index b678238..56006d0 100755
--- a/net/tools/testserver/chromiumsync.py
+++ b/net/tools/testserver/chromiumsync.py
@@ -36,6 +36,7 @@ ALL_TYPES = (
TOP_LEVEL, # The type of the 'Google Chrome' folder.
APPS,
AUTOFILL,
+ AUTOFILL_PROFILE,
BOOKMARK,
EXTENSIONS,
NIGORI,
@@ -43,7 +44,7 @@ ALL_TYPES = (
PREFERENCE,
SESSION,
THEME,
- TYPED_URL) = range(11)
+ TYPED_URL) = range(12)
# Well-known server tag of the top level "Google Chrome" folder.
TOP_LEVEL_FOLDER_TAG = 'google_chrome'
@@ -53,6 +54,7 @@ TOP_LEVEL_FOLDER_TAG = 'google_chrome'
SYNC_TYPE_TO_EXTENSION = {
APPS: app_specifics_pb2.app,
AUTOFILL: autofill_specifics_pb2.autofill,
+ AUTOFILL_PROFILE: autofill_specifics_pb2.autofill_profile,
BOOKMARK: bookmark_specifics_pb2.bookmark,
EXTENSIONS: extension_specifics_pb2.extension,
NIGORI: nigori_specifics_pb2.nigori,
@@ -248,6 +250,8 @@ class SyncDataModel(object):
parent_tag='google_chrome', sync_type=PREFERENCE),
PermanentItem('google_chrome_autofill', name='Autofill',
parent_tag='google_chrome', sync_type=AUTOFILL),
+ PermanentItem('google_chrome_autofill_profiles', name='Autofill Profiles',
+ parent_tag='google_chrome', sync_type=AUTOFILL_PROFILE),
PermanentItem('google_chrome_extensions', name='Extensions',
parent_tag='google_chrome', sync_type=EXTENSIONS),
PermanentItem('google_chrome_passwords', name='Passwords',
@@ -489,7 +493,7 @@ class SyncDataModel(object):
def _CopyOverImmutableFields(self, entry):
"""Preserve immutable fields by copying pre-commit state.
-
+
Args:
entry: A sync entity from the client.
"""
@@ -611,7 +615,7 @@ class SyncDataModel(object):
if not self._CheckParentIdForCommit(entry):
return None
- self._CopyOverImmutableFields(entry);
+ self._CopyOverImmutableFields(entry);
# At this point, the commit is definitely going to happen.