[Sync] Remove logging/checks for case where server and local entries mismatch.

net/tools/testserver/chromiumsync.py

 #!/usr/bin/python2.4
 # Copyright (c) 2011 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
 import copy
 import operator
 import pickle
 import random
 import sys
 import threading
+import time
 import urlparse
 
 import app_notification_specifics_pb2
 import app_setting_specifics_pb2
 import app_specifics_pb2
 import autofill_specifics_pb2
 import bookmark_specifics_pb2
 import extension_setting_specifics_pb2
 import extension_specifics_pb2
 import nigori_specifics_pb2
@@ skipping 46 matching lines @@
     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,
     }
 
 # The parent ID used to indicate a top-level node.
 ROOT_ID = '0'
 
+# Unix time epoch in struct_time format. The tuple corresponds to UTC Wednesday
+# Jan 1 1970, 00:00:00, non-dst.
+UNIX_TIME_EPOCH = (1970, 1, 1, 0, 0, 0, 3, 1, 0)
 
 class Error(Exception):
   """Error class for this module."""
 
 
 class ProtobufExtensionNotUnique(Error):
   """An entry should not have more than one protobuf extension present."""
 
 
 class DataTypeIdNotRecognized(Error):
@@ skipping 360 matching lines @@
     entry.sync_timestamp = self._version
 
     # Preserve the originator info, which the client is not required to send
     # when updating.
     base_entry = self._entries.get(entry.id_string)
     if base_entry:
       entry.originator_cache_guid = base_entry.originator_cache_guid
       entry.originator_client_item_id = base_entry.originator_client_item_id
 
     self._entries[entry.id_string] = copy.deepcopy(entry)
+    # Store the current time since the Unix epoch in milliseconds.
+    self._entries[entry.id_string].mtime = \

[ncarter (slow), 2011/11/11 03:07:53]

Don't escape newlines, use parens instead.

[Nicolas Zea, 2011/11/11 19:23:33]

Done.

+        int((time.mktime(time.gmtime()) - time.mktime(UNIX_TIME_EPOCH))*1000)
 
   def _ServerTagToId(self, tag):
     """Determine the server ID from a server-unique tag.
 
     The resulting value is guaranteed not to collide with the other ID
     generation methods.
 
     Args:
       datatype: The sync type (python enum) of the identified object.
       tag: The unique, known-to-the-client tag of a server-generated item.
@@ skipping 707 matching lines @@
 
     update_sieve.CheckMigrationState()
 
     new_timestamp, entries, remaining = self.account.GetChanges(update_sieve)
 
     update_response.changes_remaining = remaining
     for entry in entries:
       reply = update_response.entries.add()
       reply.CopyFrom(entry)
     update_sieve.SaveProgress(new_timestamp, update_response)