[Sync] use base::Time in sync

chrome/browser/sync/engine/syncer_unittest.cc

Index: chrome/browser/sync/engine/syncer_unittest.cc
diff --git a/chrome/browser/sync/engine/syncer_unittest.cc b/chrome/browser/sync/engine/syncer_unittest.cc
index 1fd48e420b0587aea8d45fb2936edd9c98e57590..2310b365e4c33872808761a00af0b3187cef6ee6 100644
--- a/chrome/browser/sync/engine/syncer_unittest.cc
+++ b/chrome/browser/sync/engine/syncer_unittest.cc
@@ -18,6 +18,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
+#include "base/time.h"
 #include "build/build_config.h"
 #include "chrome/browser/sync/engine/conflict_resolver.h"
 #include "chrome/browser/sync/engine/get_commit_ids_command.h"
@@ -39,6 +40,7 @@
 #include "chrome/browser/sync/test/engine/test_directory_setter_upper.h"
 #include "chrome/browser/sync/test/engine/test_id_factory.h"
 #include "chrome/browser/sync/test/engine/test_syncable_utils.h"
+#include "chrome/browser/sync/util/time.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::TimeDelta;
@@ -314,9 +316,10 @@ class SyncerTest : public testing::Test,
         entry.Put(syncable::SPECIFICS, DefaultBookmarkSpecifics());
         // Set the time to 30 seconds in the future to reduce the chance of
         // flaky tests.
-        int64 now_server_time = ClientTimeToServerTime(syncable::Now());
-        int64 now_plus_30s = ServerTimeToClientTime(now_server_time + 30000);
-        int64 now_minus_2h = ServerTimeToClientTime(now_server_time - 7200000);
+        const base::Time& now_plus_30s =
+            base::Time::Now() + base::TimeDelta::FromSeconds(30);
+        const base::Time& now_minus_2h =
+            base::Time::Now() - base::TimeDelta::FromHours(2);
         entry.Put(syncable::MTIME, now_plus_30s);
         for (size_t i = 0 ; i < arraysize(test->features) ; ++i) {
           switch (test->features[i]) {
@@ -894,9 +897,8 @@ TEST_F(SyncerTest, TestCommitListOrderingDeleteMovedItems) {
 TEST_F(SyncerTest, TestCommitListOrderingWithNesting) {
   ScopedDirLookup dir(syncdb_.manager(), syncdb_.name());
   ASSERT_TRUE(dir.good());
-  int64 now_server_time = ClientTimeToServerTime(syncable::Now());
-  int64 now_minus_2h = ServerTimeToClientTime(now_server_time - 7200000);
-
+  const base::Time& now_minus_2h =
+      base::Time::Now() - base::TimeDelta::FromHours(2);
   {
     WriteTransaction wtrans(FROM_HERE, UNITTEST, dir);
     {
@@ -1970,7 +1972,7 @@ TEST_F(SyncerTest, DoublyChangedWithResolver) {
 TEST_F(SyncerTest, CommitsUpdateDoesntAlterEntry) {
   ScopedDirLookup dir(syncdb_.manager(), syncdb_.name());
   CHECK(dir.good());
-  int64 test_time = 123456;
+  const base::Time& test_time = ProtoTimeToTime(123456);
   int64 entry_metahandle;
   {
     WriteTransaction wtrans(FROM_HERE, UNITTEST, dir);