Revert 102184 - [Sync] use base::Time in sync

chrome/browser/sync/engine/build_commit_command.cc

 // 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.
 
 #include "chrome/browser/sync/engine/build_commit_command.h"
 
 #include <limits>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/string_util.h"
 #include "chrome/browser/sync/engine/syncer_proto_util.h"
+#include "chrome/browser/sync/engine/syncer_util.h"
 #include "chrome/browser/sync/protocol/bookmark_specifics.pb.h"
 #include "chrome/browser/sync/sessions/sync_session.h"
 #include "chrome/browser/sync/syncable/syncable.h"
 #include "chrome/browser/sync/syncable/syncable_changes_version.h"
-#include "chrome/browser/sync/util/time.h"
 
 using std::set;
 using std::string;
 using std::vector;
 using syncable::Entry;
 using syncable::IS_DEL;
 using syncable::SERVER_POSITION_IN_PARENT;
 using syncable::IS_UNAPPLIED_UPDATE;
 using syncable::IS_UNSYNCED;
 using syncable::Id;
@@ skipping 136 matching lines @@
       DCHECK(!id.ServerKnows() ||
              !meta_entry.Get(syncable::UNIQUE_CLIENT_TAG).empty())
           << meta_entry;
 
       // Version 0 means to create or undelete an object.
       sync_entry->set_version(0);
     } else {
       DCHECK(id.ServerKnows()) << meta_entry;
       sync_entry->set_version(meta_entry.Get(syncable::BASE_VERSION));
     }
-    sync_entry->set_ctime(TimeToProtoTime(meta_entry.Get(syncable::CTIME)));
-    sync_entry->set_mtime(TimeToProtoTime(meta_entry.Get(syncable::MTIME)));
+    sync_entry->set_ctime(ClientTimeToServerTime(
+        meta_entry.Get(syncable::CTIME)));
+    sync_entry->set_mtime(ClientTimeToServerTime(
+        meta_entry.Get(syncable::MTIME)));
 
     // Deletion is final on the server, let's move things and then delete them.
     if (meta_entry.Get(IS_DEL)) {
       sync_entry->set_deleted(true);
     } else {
       if (meta_entry.Get(SPECIFICS).HasExtension(sync_pb::bookmark)) {
         // Common data in both new and old protocol.
         const Id& prev_id = meta_entry.Get(syncable::PREV_ID);
         string prev_id_string =
             prev_id.IsRoot() ? string() : prev_id.GetServerId();
@@ skipping 56 matching lines @@
   if (delta <= static_cast<uint64>(GetGap()*2))
     return lo + (static_cast<int64>(delta) + 7) / 8;  // Interpolate.
   else if (lo == GetFirstPosition())
     return hi - GetGap();  // Extend range just before successor.
   else
     return lo + GetGap();  // Use or extend range just after predecessor.
 }
 
 
 }  // namespace browser_sync