diff options
| author | stevet@chromium.org <stevet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-28 15:34:31 +0000 |
|---|---|---|
| committer | stevet@chromium.org <stevet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-28 15:34:31 +0000 |
| commit | 18b854258de2a258c495bd169d8bfe0bf1a1ac8e (patch) | |
| tree | 74062ee5a76e0b911bbcba86a4a6f268279433c8 /net | |
| parent | 6114e7d9277cfd034665f42ed5a489c2707b7b34 (diff) | |
| download | chromium_src-18b854258de2a258c495bd169d8bfe0bf1a1ac8e.zip chromium_src-18b854258de2a258c495bd169d8bfe0bf1a1ac8e.tar.gz chromium_src-18b854258de2a258c495bd169d8bfe0bf1a1ac8e.tar.bz2 | |
Add protobuffer and model type for syncing custom search engines. Includes all boilerplate helpers, unittests, and python server updates.
BUG=15548
TEST=None. All sync unit and integration test should still run and pass.
Review URL: http://codereview.chromium.org/7150023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90772 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rwxr-xr-x | net/tools/testserver/chromiumsync.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/net/tools/testserver/chromiumsync.py b/net/tools/testserver/chromiumsync.py index c3cc99c..fc1be20 100755 --- a/net/tools/testserver/chromiumsync.py +++ b/net/tools/testserver/chromiumsync.py @@ -25,6 +25,7 @@ import extension_specifics_pb2 import nigori_specifics_pb2 import password_specifics_pb2 import preference_specifics_pb2 +import search_engine_specifics_pb2 import session_specifics_pb2 import sync_pb2 import theme_specifics_pb2 @@ -44,9 +45,10 @@ ALL_TYPES = ( NIGORI, PASSWORD, PREFERENCE, + SEARCH_ENGINE, SESSION, THEME, - TYPED_URL) = range(12) + TYPED_URL) = range(13) # Well-known server tag of the top level 'Google Chrome' folder. TOP_LEVEL_FOLDER_TAG = 'google_chrome' @@ -62,6 +64,7 @@ SYNC_TYPE_TO_EXTENSION = { NIGORI: nigori_specifics_pb2.nigori, PASSWORD: password_specifics_pb2.password, PREFERENCE: preference_specifics_pb2.preference, + SEARCH_ENGINE: search_engine_specifics_pb2.search_engine, SESSION: session_specifics_pb2.session, THEME: theme_specifics_pb2.theme, TYPED_URL: typed_url_specifics_pb2.typed_url, @@ -381,6 +384,8 @@ class SyncDataModel(object): parent_tag='google_chrome', sync_type=EXTENSIONS), PermanentItem('google_chrome_passwords', name='Passwords', parent_tag='google_chrome', sync_type=PASSWORD), + PermanentItem('google_chrome_search_engines', name='Search Engines', + parent_tag='google_chrome', sync_type=SEARCH_ENGINE), PermanentItem('google_chrome_sessions', name='Sessions', parent_tag='google_chrome', sync_type=SESSION), PermanentItem('google_chrome_themes', name='Themes', |