| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "sync/util/time.h" | 5 #include "sync/util/time.h" |
| 6 | 6 |
| 7 #include "base/i18n/time_formatting.h" | 7 #include "base/i18n/time_formatting.h" |
| 8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
| 9 | 9 |
| 10 namespace syncer { | 10 namespace syncer { |
| 11 | 11 |
| 12 int64 TimeToProtoTime(const base::Time& t) { | 12 int64 TimeToProtoTime(const base::Time& t) { |
| 13 return (t - base::Time::UnixEpoch()).InMilliseconds(); | 13 return t.is_null() ? 0 : (t - base::Time::UnixEpoch()).InMilliseconds(); |
| 14 } | 14 } |
| 15 | 15 |
| 16 base::Time ProtoTimeToTime(int64 proto_t) { | 16 base::Time ProtoTimeToTime(int64 proto_t) { |
| 17 return base::Time::UnixEpoch() + base::TimeDelta::FromMilliseconds(proto_t); | 17 return base::Time::UnixEpoch() + base::TimeDelta::FromMilliseconds(proto_t); |
| 18 } | 18 } |
| 19 | 19 |
| 20 std::string GetTimeDebugString(const base::Time& t) { | 20 std::string GetTimeDebugString(const base::Time& t) { |
| 21 return base::UTF16ToUTF8(base::TimeFormatFriendlyDateAndTime(t)); | 21 return base::UTF16ToUTF8(base::TimeFormatFriendlyDateAndTime(t)); |
| 22 } | 22 } |
| 23 | 23 |
| 24 } // namespace syncer | 24 } // namespace syncer |
| OLD | NEW |