Do not define OS_CHROMEOS for untrusted NaCl code

so that we do not need !defined(__native_client) for Chrome
OS specific clock ID.

TEST=Manually checked untrusted code does not have OS_CHROMEOS
     and trusted code does have it.
TEST=trybots
BUG=None

Review URL: https://codereview.chromium.org/324403002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@276985 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 9 deletions

diff --git a/base/time/time_posix.cc b/base/time/time_posix.cc
index 3a773bf..b5b8213 100644
--- a/base/time/time_posix.cc
+++ b/base/time/time_posix.cc
@@ -320,13 +320,8 @@ TimeTicks TimeTicks::ThreadNow() {
 #endif
 }
 
-// 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__)
+// Use the Chrome OS specific system-wide clock.
+#if defined(OS_CHROMEOS)
 // static
 TimeTicks TimeTicks::NowFromSystemTraceTime() {
   uint64_t absolute_micro;
@@ -344,14 +339,14 @@ TimeTicks TimeTicks::NowFromSystemTraceTime() {
   return TimeTicks(absolute_micro);
 }
 
-#else  // !(defined(OS_CHROMEOS) && !defined(__native_client__))
+#else  // !defined(OS_CHROMEOS)
 
 // static
 TimeTicks TimeTicks::NowFromSystemTraceTime() {
   return HighResNow();
 }
 
-#endif  // defined(OS_CHROMEOS) && !defined(__native_client__)
+#endif  // defined(OS_CHROMEOS)
 
 #endif  // !OS_MACOSX