Update Time and TimeTicks for NaCl now that it has CLOCK_MONOTONIC.

base/time_posix.cc

 // Copyright (c) 2012 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 "base/time.h"
 
 #include <sys/time.h>
 #include <time.h>
 #include <unistd.h>
 
@@ skipping 175 matching lines @@
     milliseconds = seconds * kMillisecondsPerSecond + exploded.millisecond;
   }
 
   // Adjust from Unix (1970) to Windows (1601) epoch.
   return Time((milliseconds * kMicrosecondsPerMillisecond) +
       kWindowsEpochDeltaMicroseconds);
 }
 
 // TimeTicks ------------------------------------------------------------------
 // FreeBSD 6 has CLOCK_MONOLITHIC but defines _POSIX_MONOTONIC_CLOCK to -1.
-#if (defined(OS_POSIX) && !defined(OS_NACL) &&                          \
+#if (defined(OS_POSIX) &&                          \
      defined(_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0) || \
      defined(OS_BSD) || defined(OS_ANDROID)
 
 // static
 TimeTicks TimeTicks::Now() {
   uint64_t absolute_micro;
 
   struct timespec ts;
   if (clock_gettime(CLOCK_MONOTONIC, &ts) != 0) {
     NOTREACHED() << "clock_gettime(CLOCK_MONOTONIC) failed.";
     return TimeTicks();
   }
 
   absolute_micro =
       (static_cast<int64>(ts.tv_sec) * Time::kMicrosecondsPerSecond) +
       (static_cast<int64>(ts.tv_nsec) / Time::kNanosecondsPerMicrosecond);
 
   return TimeTicks(absolute_micro);
 }
-
-#elif defined(OS_NACL)
-
-TimeTicks TimeTicks::Now() {
-  // Sadly, Native Client does not have _POSIX_TIMERS enabled in sys/features.h
-  // Apparently NaCl only has CLOCK_REALTIME:
-  // http://code.google.com/p/nativeclient/issues/detail?id=1159
-  return TimeTicks(clock());
-}
-
 #else  // _POSIX_MONOTONIC_CLOCK
 #error No usable tick clock function on this platform.
 #endif  // _POSIX_MONOTONIC_CLOCK
 
 // static
 TimeTicks TimeTicks::HighResNow() {
   return Now();
 }
 
 #if defined(OS_CHROMEOS)
@@ skipping 57 matching lines @@
     result.tv_usec = static_cast<suseconds_t>(Time::kMicrosecondsPerSecond) - 1;
     return result;
   }
   int64 us = us_ - kTimeTToMicrosecondsOffset;
   result.tv_sec = us / Time::kMicrosecondsPerSecond;
   result.tv_usec = us % Time::kMicrosecondsPerSecond;
   return result;
 }
 
 }  // namespace base