Replaces deprecated CFGregorianDate with CFCalendar.

base/third_party/nspr/prtime.cc

 /* Portions are Copyright (C) 2011 Google Inc */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
  *
  * Software distributed under the License is distributed on an "AS IS" basis,
@@ skipping 55 matching lines @@
  */
 
 #include "base/logging.h"
 #include "base/third_party/nspr/prtime.h"
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #elif defined(OS_MACOSX)
 #include <CoreFoundation/CoreFoundation.h>
+#include "base/mac/scoped_cftyperef.h"
 #elif defined(OS_ANDROID)
 #include <ctype.h>
 #include "base/os_compat_android.h"  // For timegm()
 #elif defined(OS_NACL)
 #include "base/os_compat_nacl.h"  // For timegm()
 #endif
 #include <errno.h>  /* for EINVAL */
 #include <time.h>
 
 /* Implements the Unix localtime_r() function for windows */
@@ skipping 45 matching lines @@
     // to microsecond units.
     PRTime result =
         static_cast<PRTime>((uli.QuadPart / 10) - 11644473600000000i64);
     // Adjust for time zone and dst.  Convert from seconds to microseconds.
     result -= (exploded->tm_params.tp_gmt_offset +
                exploded->tm_params.tp_dst_offset) * kSecondsToMicroseconds;
     // Add microseconds that cannot be represented in |st|.
     result += exploded->tm_usec % 1000;
     return result;
 #elif defined(OS_MACOSX)
-    // Create the system struct representing our exploded time.
-    CFGregorianDate gregorian_date;
-    gregorian_date.year = exploded->tm_year;
-    gregorian_date.month = exploded->tm_month + 1;
-    gregorian_date.day = exploded->tm_mday;
-    gregorian_date.hour = exploded->tm_hour;
-    gregorian_date.minute = exploded->tm_min;
-    gregorian_date.second = exploded->tm_sec;
-
     // Compute |absolute_time| in seconds, correct for gmt and dst
     // (note the combined offset will be negative when we need to add it), then
     // convert to microseconds which is what PRTime expects.
-    CFAbsoluteTime absolute_time =
-        CFGregorianDateGetAbsoluteTime(gregorian_date, NULL);
+    base::ScopedCFTypeRef<CFCalendarRef> gregorian(
+        CFCalendarCreateWithIdentifier(kCFAllocatorDefault,
+                                       kCFGregorianCalendar));
+    base::ScopedCFTypeRef<CFTimeZoneRef> time_zone(
+        CFTimeZoneCreateWithTimeIntervalFromGMT(kCFAllocatorDefault, 0));
+    CFCalendarSetTimeZone(gregorian, time_zone);
+    CFAbsoluteTime absolute_time;
+    CFCalendarComposeAbsoluteTime(gregorian, &absolute_time, "yMdHms",
+                                  static_cast<int>(exploded->tm_year),
+                                  static_cast<int>(exploded->tm_month + 1),
+                                  static_cast<int>(exploded->tm_mday),
+                                  static_cast<int>(exploded->tm_hour),
+                                  static_cast<int>(exploded->tm_min),

[Nico, 2015/12/04 20:18:59]

I looked at upstream NSPR to see if they have this problem, and it turns out
they don't use platform-specific code for this at all. It looks like this file
used the windows code above when chrome was open-sourced, and the other
platforms were filled in over time. I asked wtc if he remembered why we don't
just use upstream nspr code here, and he replied:

"""
That was done to reduce code size.

It is fine to copy the original PR_ImplodeTime function to Chromium. I
remember Chromium's alternative implementation has the Unix Year 2038
problem on 32-bit Linux. Copying NSPR's original code will fix that
problem.
"""

Maybe with the three distinct implementations just using the upstream version is
actually simpler? (http://lxr.mozilla.org/nspr/source/pr/src/misc/prtime.c#221)

[pkl (ping after 24h if needed), 2016/02/03 06:42:31]

This change has been moved to https://codereview.chromium.org/1657433002/

+                                  static_cast<int>(exploded->tm_sec));
     PRTime result = static_cast<PRTime>(absolute_time);
     result -= exploded->tm_params.tp_gmt_offset +
               exploded->tm_params.tp_dst_offset;
     result += kCFAbsoluteTimeIntervalSince1970;  // PRTime epoch is 1970
     result *= kSecondsToMicroseconds;
     result += exploded->tm_usec;
     return result;
 #elif defined(OS_POSIX)
     struct tm exp_tm = {0};
     exp_tm.tm_sec  = exploded->tm_sec;
@@ skipping 1078 matching lines @@
                               + 60 * localTime.tm_hour
                               + 1440 * (localTime.tm_mday - 2);
         }
 
   result->tm_params.tp_gmt_offset = zone_offset * 60;
   result->tm_params.tp_dst_offset = dst_offset * 60;
 
   *result_imploded = PR_ImplodeTime(result);
   return PR_SUCCESS;
 }