Revert "Non-SFI NaCl: Allow CLOCK_SYSTEM_TRACE on Chrome OS"

components/nacl/loader/nonsfi/nonsfi_sandbox_unittest.cc

Index: components/nacl/loader/nonsfi/nonsfi_sandbox_unittest.cc
diff --git a/components/nacl/loader/nonsfi/nonsfi_sandbox_unittest.cc b/components/nacl/loader/nonsfi/nonsfi_sandbox_unittest.cc
index 3da4a8c6fdc9c63ea878925a5c8c10ea3f99e1da..8d0a4d499a5ad0d1e638a1e4fe5c23617a660b7e 100644
--- a/components/nacl/loader/nonsfi/nonsfi_sandbox_unittest.cc
+++ b/components/nacl/loader/nonsfi/nonsfi_sandbox_unittest.cc
@@ -31,10 +31,8 @@
 #include "base/files/scoped_file.h"
 #include "base/logging.h"
 #include "base/posix/eintr_wrapper.h"
-#include "base/time/time.h"
 #include "sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h"
 #include "sandbox/linux/seccomp-bpf/bpf_tests.h"
-#include "sandbox/linux/services/linux_syscalls.h"
 #include "third_party/lss/linux_syscall_support.h"  // for MAKE_PROCESS_CPUCLOCK
 
 namespace {
@@ -410,9 +408,6 @@ BPF_TEST_C(NaClNonSfiSandboxTest,
   CheckClock(CLOCK_PROCESS_CPUTIME_ID);
   CheckClock(CLOCK_REALTIME);
   CheckClock(CLOCK_THREAD_CPUTIME_ID);
-#if defined(OS_CHROMEOS)
-  CheckClock(base::TimeTicks::kClockSystemTrace);
-#endif
 }
 
 BPF_DEATH_TEST_C(NaClNonSfiSandboxTest,
@@ -423,16 +418,6 @@ BPF_DEATH_TEST_C(NaClNonSfiSandboxTest,
   clock_gettime(CLOCK_MONOTONIC_RAW, &ts);
 }
 
-#if !defined(OS_CHROMEOS)
-BPF_DEATH_TEST_C(NaClNonSfiSandboxTest,
-                 clock_gettime_crash_system_trace,
-                 DEATH_MESSAGE(sandbox::GetErrorMessageContentForTests()),
-                 nacl::nonsfi::NaClNonSfiBPFSandboxPolicy) {
-  struct timespec ts;
-  clock_gettime(base::TimeTicks::kClockSystemTrace, &ts);
-}
-#endif
-
 BPF_DEATH_TEST_C(NaClNonSfiSandboxTest,
                  clock_gettime_crash_cpu_clock,
                  DEATH_MESSAGE(sandbox::GetErrorMessageContentForTests()),