[sync] Divorce python sync test server chromiumsync.py from testserver.py

sync/tools/testserver/chromiumsync.py

-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """An implementation of the server side of the Chromium sync protocol.
 
 The details of the protocol are described mostly by comments in the protocol
 buffer definition at chrome/browser/sync/protocol/sync.proto.
 """
 
 import cgi
@@ skipping 423 matching lines @@
                     parent_tag=ROOT_ID, sync_type=APPS),
       PermanentItem('google_chrome_app_notifications', name='App Notifications',
                     parent_tag=ROOT_ID, sync_type=APP_NOTIFICATION),
       PermanentItem('google_chrome_app_settings',
                     name='App Settings',
                     parent_tag=ROOT_ID, sync_type=APP_SETTINGS),
       PermanentItem('google_chrome_bookmarks', name='Bookmarks',
                     parent_tag=ROOT_ID, sync_type=BOOKMARK),
       PermanentItem('bookmark_bar', name='Bookmark Bar',
                     parent_tag='google_chrome_bookmarks', sync_type=BOOKMARK),
-      PermanentItem('synced_bookmarks', name='Mobile Bookmarks',
-                    parent_tag='google_chrome_bookmarks', sync_type=BOOKMARK),
       PermanentItem('other_bookmarks', name='Other Bookmarks',
                     parent_tag='google_chrome_bookmarks', sync_type=BOOKMARK),
       PermanentItem('synced_bookmarks', name='Synced Bookmarks',
                     parent_tag='google_chrome_bookmarks', sync_type=BOOKMARK,
-                    create_by_default=False),
+                    create_by_default=False),  # Must be True in the iOS tree.
       PermanentItem('google_chrome_autofill', name='Autofill',
                     parent_tag=ROOT_ID, sync_type=AUTOFILL),
       PermanentItem('google_chrome_autofill_profiles', name='Autofill Profiles',
                     parent_tag=ROOT_ID, sync_type=AUTOFILL_PROFILE),
       PermanentItem('google_chrome_device_info', name='Device Info',
                     parent_tag=ROOT_ID, sync_type=DEVICE_INFO),
       PermanentItem('google_chrome_experiments', name='Experiments',
                     parent_tag=ROOT_ID, sync_type=EXPERIMENTS),
       PermanentItem('google_chrome_extension_settings',
                     name='Extension Settings',
                     parent_tag=ROOT_ID, sync_type=EXTENSION_SETTINGS),
       PermanentItem('google_chrome_extensions', name='Extensions',
                     parent_tag=ROOT_ID, sync_type=EXTENSIONS),
       PermanentItem('google_chrome_history_delete_directives',
                     name='History Delete Directives',
                     parent_tag=ROOT_ID,
                     sync_type=HISTORY_DELETE_DIRECTIVE),
       PermanentItem('google_chrome_nigori', name='Nigori',
                     parent_tag=ROOT_ID, sync_type=NIGORI),
       PermanentItem('google_chrome_passwords', name='Passwords',
                     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='Synced Notifications',
+      PermanentItem('google_chrome_synced_notifications',
+                    name='Synced Notifications',
                     parent_tag=ROOT_ID, sync_type=SYNCED_NOTIFICATION),
       PermanentItem('google_chrome_search_engines', name='Search Engines',
                     parent_tag=ROOT_ID, sync_type=SEARCH_ENGINE),
       PermanentItem('google_chrome_sessions', name='Sessions',
                     parent_tag=ROOT_ID, sync_type=SESSION),
       PermanentItem('google_chrome_themes', name='Themes',
                     parent_tag=ROOT_ID, sync_type=THEME),
       PermanentItem('google_chrome_typed_urls', name='Typed URLs',
                     parent_tag=ROOT_ID, sync_type=TYPED_URL),
       ]
@@ skipping 554 matching lines @@
 
   def GetInducedError(self):
     return self.induced_error
 
 
 class TestServer(object):
   """An object to handle requests for one (and only one) Chrome Sync account.
 
   TestServer consumes the sync command messages that are the outermost
   layers of the protocol, performs the corresponding actions on its
-  SyncDataModel, and constructs an appropropriate response message.
+  SyncDataModel, and constructs an appropriate response message.
   """
 
   def __init__(self):
     # The implementation supports exactly one account; its state is here.
     self.account = SyncDataModel()
     self.account_lock = threading.Lock()
     # Clients that have talked to us: a map from the full client ID
     # to its nickname.
     self.clients = {}
     self.client_name_generator = ('+' * times + chr(c)
@@ skipping 301 matching lines @@
     sending_nigori_node = False
     for entry in entries:
       if entry.name == 'Nigori':
         sending_nigori_node = True
       reply = update_response.entries.add()
       reply.CopyFrom(entry)
     update_sieve.SaveProgress(new_timestamp, update_response)
 
     if update_request.need_encryption_key or sending_nigori_node:
       update_response.encryption_keys.extend(self.account.GetKeystoreKeys())