[Sync] Enable USS DeviceInfo for bots.

components/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 411 matching lines @@
     if request.from_progress_marker:
       for marker in request.from_progress_marker:
         data_type = ProtocolDataTypeIdToSyncType(marker.data_type_id)
         if marker.HasField('timestamp_token_for_migration'):
           timestamp = marker.timestamp_token_for_migration
           if timestamp:
             self._migration_versions_to_check[data_type] = 1
         elif marker.token:
           (timestamp, version) = pickle.loads(marker.token)
           self._migration_versions_to_check[data_type] = version
-        elif marker.HasField('token'):
+        else:
           timestamp = 0
-        else:
-          raise ValueError('No timestamp information in progress marker.')
         data_type = ProtocolDataTypeIdToSyncType(marker.data_type_id)
         self._state[data_type] = timestamp
     elif request.HasField('from_timestamp'):
       for data_type in GetEntryTypesFromSpecifics(request.requested_types):
         self._state[data_type] = request.from_timestamp
         self._migration_versions_to_check[data_type] = 1
     if self._state:
       self._state[TOP_LEVEL] = min(self._state.itervalues())
 
   def SummarizeRequest(self):
@@ skipping 1196 matching lines @@
 
     Args:
       sessions_commit_delay_seconds: The desired sync delay time for sessions.
     """
     if not self._client_command:
       self._client_command = client_commands_pb2.ClientCommand()
 
     self._client_command.sessions_commit_delay_seconds = \
         sessions_commit_delay_seconds
     return self._client_command