Roll Chrome into Mojo.

base/time/time_unittest.cc

Index: base/time/time_unittest.cc
diff --git a/base/time/time_unittest.cc b/base/time/time_unittest.cc
index 07b1e6b77e704b25fc5198a8c3d4756245ea51aa..27f71b46a60b6aad84ebb041ec56d9ad7ee4b789 100644
--- a/base/time/time_unittest.cc
+++ b/base/time/time_unittest.cc
@@ -643,8 +643,8 @@ TEST(TimeTicks, Deltas) {
 }
 
 static void HighResClockTest(TimeTicks (*GetTicks)()) {
-  // HighResNow doesn't work on some systems.  Since the product still works
-  // even if it doesn't work, it makes this entire test questionable.
+  // IsHighResolution() is false on some systems.  Since the product still works
+  // even if it's false, it makes this entire test questionable.
   if (!TimeTicks::IsHighResolution())
     return;
 
@@ -679,8 +679,8 @@ static void HighResClockTest(TimeTicks (*GetTicks)()) {
   EXPECT_TRUE(success);
 }
 
-TEST(TimeTicks, HighResNow) {
-  HighResClockTest(&TimeTicks::HighResNow);
+TEST(TimeTicks, HighRes) {
+  HighResClockTest(&TimeTicks::Now);
 }
 
 // Fails frequently on Android http://crbug.com/352633 with:
@@ -711,7 +711,7 @@ TEST(TimeTicks, MAYBE_ThreadNow) {
 }
 
 TEST(TimeTicks, NowFromSystemTraceTime) {
-  // Re-use HighResNow test for now since clock properties are identical.
+  // Re-use HighRes test for now since clock properties are identical.
   HighResClockTest(&TimeTicks::NowFromSystemTraceTime);
 }