| Index: sync/syncable/entry_kernel.h
|
| diff --git a/sync/syncable/entry_kernel.h b/sync/syncable/entry_kernel.h
|
| index 3a4e54c035797fe18a7fc2f4cb0932000f67c0c6..9314797faf7438bcbdf1a9dd386c6d088d27ad2a 100644
|
| --- a/sync/syncable/entry_kernel.h
|
| +++ b/sync/syncable/entry_kernel.h
|
| @@ -216,8 +216,8 @@ struct EntryKernel {
|
| // Round-trip to proto time format and back so that we have
|
| // consistent time resolutions (ms).
|
| time_fields[field - TIME_FIELDS_BEGIN] =
|
| - csync::ProtoTimeToTime(
|
| - csync::TimeToProtoTime(value));
|
| + syncer::ProtoTimeToTime(
|
| + syncer::TimeToProtoTime(value));
|
| }
|
| inline void put(IdField field, const Id& value) {
|
| id_fields[field - ID_FIELDS_BEGIN] = value;
|
| @@ -307,7 +307,7 @@ struct EntryKernelMutation {
|
|
|
| typedef std::map<int64, EntryKernelMutation> EntryKernelMutationMap;
|
|
|
| -typedef csync::Immutable<EntryKernelMutationMap>
|
| +typedef syncer::Immutable<EntryKernelMutationMap>
|
| ImmutableEntryKernelMutationMap;
|
|
|
| // Caller owns the return value.
|
|
|