summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryzshen@chromium.org <yzshen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-10 21:37:43 +0000
committeryzshen@chromium.org <yzshen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-10 21:37:43 +0000
commit00534b5b799c69a21426ae47586d938fbceba254 (patch)
tree7dcb8533ec47df8cf90f3986638b004cc272df46
parent346fbcf8e3a48b3e3daf9cd3cc8166cdde70ae31 (diff)
downloadchromium_src-00534b5b799c69a21426ae47586d938fbceba254.zip
chromium_src-00534b5b799c69a21426ae47586d938fbceba254.tar.gz
chromium_src-00534b5b799c69a21426ae47586d938fbceba254.tar.bz2
Revert 136389 - Enable system trace clock use on chrome os.
Manually define CLOCK_SYSTEM_TRACE for OS_CHROMEOS. This is in the code (and not gyp) to minimize scope. BUG=chromium-os:30502 TEST=verify chrome:tracing works w/ a chromeos=1 build on linux and on cros (using the correct clock in each case) Change-Id: I9439a1de9fe30cb2f34652020a29a4450b71e1ea Review URL: https://chromiumcodereview.appspot.com/10356028 TBR=sleffler@chromium.org Review URL: https://chromiumcodereview.appspot.com/10382112 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136397 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--base/time_posix.cc6
1 files changed, 0 insertions, 6 deletions
diff --git a/base/time_posix.cc b/base/time_posix.cc
index 1c96451..b8f1385 100644
--- a/base/time_posix.cc
+++ b/base/time_posix.cc
@@ -24,12 +24,6 @@ namespace base {
#if defined(OS_ANDROID)
#define _POSIX_MONOTONIC_CLOCK 1
#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
-#endif
struct timespec TimeDelta::ToTimeSpec() const {
int64 microseconds = InMicroseconds();