Reland: Non-SFI NaCl: Allow CLOCK_SYSTEM_TRACE on Chrome OS

base/time/time_posix.cc

Index: base/time/time_posix.cc
diff --git a/base/time/time_posix.cc b/base/time/time_posix.cc
index 6b08bb3bd2020d71c77f25c2c57db88afb8ed371..3a773bf3741745fb3477f991474f60f1f8129781 100644
--- a/base/time/time_posix.cc
+++ b/base/time/time_posix.cc
@@ -320,18 +320,19 @@ TimeTicks TimeTicks::ThreadNow() {
 #endif
 }
 
-#if defined(OS_CHROMEOS)
-// Force definition of the system trace clock; it is a chromeos-only api
-// at the moment and surfacing it in the right place requires mucking
-// with glibc et al.
-#define CLOCK_SYSTEM_TRACE 11
-
+// NaCl IRT does not support the Chrome OS specific clock
+// ID. build/common.gypi sets OS_CHROMEOS without any other OS_*
+// macros for untrusted NaCl build so we need to check
+// __native_client__ explicitly.
+// TODO(hamaji): Do not specify OS_CHROMEOS for untrusted NaCl build
+// and remove !defined(__native_client__).
+#if defined(OS_CHROMEOS) && !defined(__native_client__)
 // static
 TimeTicks TimeTicks::NowFromSystemTraceTime() {
   uint64_t absolute_micro;
 
   struct timespec ts;
-  if (clock_gettime(CLOCK_SYSTEM_TRACE, &ts) != 0) {
+  if (clock_gettime(kClockSystemTrace, &ts) != 0) {
     // NB: fall-back for a chrome os build running on linux
     return HighResNow();
   }
@@ -343,14 +344,14 @@ TimeTicks TimeTicks::NowFromSystemTraceTime() {
   return TimeTicks(absolute_micro);
 }
 
-#else // !defined(OS_CHROMEOS)
+#else  // !(defined(OS_CHROMEOS) && !defined(__native_client__))

[hamaji, 2014/06/05 18:21:02]

git cl format added this

 
 // static
 TimeTicks TimeTicks::NowFromSystemTraceTime() {
   return HighResNow();
 }
 
-#endif // defined(OS_CHROMEOS)
+#endif  // defined(OS_CHROMEOS) && !defined(__native_client__)
 
 #endif  // !OS_MACOSX