Turn time_mac.cc back on, with workaround for scoped_cftyperef reset bug

base/time_mac.cc

 // Copyright (c) 2008 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.h"
 
 #include <CoreFoundation/CFDate.h>
 #include <CoreFoundation/CFTimeZone.h>
 #include <mach/mach_time.h>
 #include <sys/time.h>
@@ skipping 10 matching lines @@
 // there are already cookie expiration dates, etc., past that time out in
 // the field.  Using CFDate prevents that problem, and using mach_absolute_time
 // for TimeTicks gives us nice high-resolution interval timing.
 
 // Time -----------------------------------------------------------------------
 
 // The internal representation of Time uses a 64-bit microsecond count
 // from 1970-01-01 00:00:00 UTC.  Core Foundation uses a double second count
 // since 2001-01-01 00:00:00 UTC.
 
-// Some functions in time.c use time_t directly, so we provide a zero offset
+// Some functions in time.cc use time_t directly, so we provide a zero offset
 // for them.  The epoch is 1970-01-01 00:00:00 UTC.
 // static
 const int64 Time::kTimeTToMicrosecondsOffset = GG_INT64_C(0);
 
 // static
 Time Time::Now() {
   CFAbsoluteTime now =
       CFAbsoluteTimeGetCurrent() + kCFAbsoluteTimeIntervalSince1970;
   return Time(static_cast<int64>(now * kMicrosecondsPerSecond));
 }
 
 // static
 Time Time::FromExploded(bool is_local, const Exploded& exploded) {
   CFGregorianDate date;
   date.second = exploded.second +
       exploded.millisecond / static_cast<double>(kMillisecondsPerSecond);
   date.minute = exploded.minute;
   date.hour = exploded.hour;
   date.day = exploded.day_of_month;
   date.month = exploded.month;
   date.year = exploded.year;
 
-  scoped_cftyperef<CFTimeZoneRef> time_zone;
-  if (is_local)
-    time_zone.reset(CFTimeZoneCopySystem());
+  scoped_cftyperef<CFTimeZoneRef>
+      time_zone(is_local ? CFTimeZoneCopySystem() : NULL);
   CFAbsoluteTime seconds = CFGregorianDateGetAbsoluteTime(date, time_zone) +
       kCFAbsoluteTimeIntervalSince1970;
   return Time(static_cast<int64>(seconds * kMicrosecondsPerSecond));
 }
 
 void Time::Explode(bool is_local, Exploded* exploded) const {
   CFAbsoluteTime seconds =
       (static_cast<double>(us_) / kMicrosecondsPerSecond) -
       kCFAbsoluteTimeIntervalSince1970;
   
-  scoped_cftyperef<CFTimeZoneRef> time_zone;
-  if (is_local)
-    time_zone.reset(CFTimeZoneCopySystem());
+  scoped_cftyperef<CFTimeZoneRef>
+      time_zone(is_local ? CFTimeZoneCopySystem() : NULL);
   CFGregorianDate date = CFAbsoluteTimeGetGregorianDate(seconds, time_zone);
   
   exploded->year = date.year;
   exploded->month = date.month;
   exploded->day_of_month = date.day;
   exploded->hour = date.hour;
   exploded->minute = date.minute;
   exploded->second = date.second;
   exploded->millisecond  =
       static_cast<int>(date.second * kMillisecondsPerSecond) %
@@ skipping 32 matching lines @@
 
   return TimeTicks(absolute_micro);
 }
 
 // static
 TimeTicks TimeTicks::HighResNow() {
   return Now();
 }
 
 }  // namespace base