Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3609)

Unified Diff: base/time/time_mac.cc

Issue 274193007: Back out r269483 and the line of fixes that followed it. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/threading/platform_thread_mac.mm ('k') | chrome/browser/mac/install_from_dmg.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/time/time_mac.cc
diff --git a/base/time/time_mac.cc b/base/time/time_mac.cc
index 515cafe35b278fb5f8ea52f3342ce66feb49ebad..6089efbbb6b5d231a034096dd373b3ead1e428c1 100644
--- a/base/time/time_mac.cc
+++ b/base/time/time_mac.cc
@@ -15,7 +15,6 @@
#include "base/basictypes.h"
#include "base/logging.h"
-#include "base/mac/mach_logging.h"
#include "base/mac/scoped_cftyperef.h"
#include "base/mac/scoped_mach_port.h"
@@ -47,7 +46,7 @@ uint64_t ComputeCurrentTicks() {
// whether mach_timebase_info has already been called. This is
// recommended by Apple's QA1398.
kern_return_t kr = mach_timebase_info(&timebase_info);
- MACH_DCHECK(kr == KERN_SUCCESS, kr) << "mach_timebase_info";
+ DCHECK_EQ(KERN_SUCCESS, kr);
}
// mach_absolute_time is it when it comes to ticks on the Mac. Other calls
@@ -86,7 +85,7 @@ uint64_t ComputeThreadTicks() {
THREAD_BASIC_INFO,
reinterpret_cast<thread_info_t>(&thread_info_data),
&thread_info_count);
- MACH_DCHECK(kr == KERN_SUCCESS, kr) << "thread_info";
+ DCHECK_EQ(KERN_SUCCESS, kr);
return (thread_info_data.user_time.seconds *
base::Time::kMicrosecondsPerSecond) +
« no previous file with comments | « base/threading/platform_thread_mac.mm ('k') | chrome/browser/mac/install_from_dmg.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698