Back out r269483 and the line of fixes that followed it.

base/time/time_mac.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/time/time.h"
 
 #include <CoreFoundation/CFDate.h>
 #include <CoreFoundation/CFTimeZone.h>
 #include <mach/mach.h>
 #include <mach/mach_time.h>
 #include <sys/sysctl.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <time.h>
 
 #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"
 
 namespace {
 
 uint64_t ComputeCurrentTicks() {
 #if defined(OS_IOS)
   // On iOS mach_absolute_time stops while the device is sleeping. Instead use
   // now - KERN_BOOTTIME to get a time difference that is not impacted by clock
   // changes. KERN_BOOTTIME will be updated by the system whenever the system
@@ skipping 11 matching lines @@
   uint64_t absolute_micro;
 
   static mach_timebase_info_data_t timebase_info;
   if (timebase_info.denom == 0) {
     // Zero-initialization of statics guarantees that denom will be 0 before
     // calling mach_timebase_info.  mach_timebase_info will never set denom to
     // 0 as that would be invalid, so the zero-check can be used to determine
     // 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
   // with less precision (such as TickCount) just call through to
   // mach_absolute_time.
 
   // timebase_info converts absolute time tick units into nanoseconds.  Convert
   // to microseconds up front to stave off overflows.
   absolute_micro =
       mach_absolute_time() / base::Time::kNanosecondsPerMicrosecond *
@@ skipping 18 matching lines @@
   if (thread == MACH_PORT_NULL) {
     DLOG(ERROR) << "Failed to get mach_thread_self()";
     return 0;
   }
 
   kern_return_t kr = thread_info(
       thread,
       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) +
          thread_info_data.user_time.microseconds;
 #endif  // defined(OS_IOS)
 }
 
 }  // namespace
 
 namespace base {
@@ skipping 132 matching lines @@
 TimeTicks TimeTicks::ThreadNow() {
   return TimeTicks(ComputeThreadTicks());
 }
 
 // static
 TimeTicks TimeTicks::NowFromSystemTraceTime() {
   return HighResNow();
 }
 
 }  // namespace base