[Sync] Add support for proxy types

sync/tools/testserver/chromiumsync.py

 # 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.
 """
 
@@ skipping 47 matching lines @@
     EXTENSIONS,
     HISTORY_DELETE_DIRECTIVE,
     NIGORI,
     PASSWORD,
     PREFERENCE,
     SEARCH_ENGINE,
     SESSION,
     SYNCED_NOTIFICATION,
     THEME,
     TYPED_URL,
-    EXTENSION_SETTINGS) = range(21)
+    EXTENSION_SETTINGS,) = range(21)
 
 # 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.
 # Note: This enum should be kept in the same order as the enum in sync_test.h.
 SYNC_ERROR_FREQUENCY = (
     ERROR_FREQUENCY_NONE,
     ERROR_FREQUENCY_ALWAYS,
     ERROR_FREQUENCY_TWO_THIRDS) = range(3)
 
 # Well-known server tag of the top level 'Google Chrome' folder.
@@ skipping 1287 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())