[core] Merge rfc1123, iso8601, and parse_date into chrono.hpp and fix their API

3 files changed, 7 insertions, 12 deletions

diff --git a/platform/android/src/http_request_android.cpp b/platform/android/src/http_request_android.cpp
index d30d1572ff..7a234a609c 100644
--- a/platform/android/src/http_request_android.cpp
+++ b/platform/android/src/http_request_android.cpp
@@ -5,10 +5,8 @@
 #include "jni.hpp"
 
 #include <mbgl/util/async_task.hpp>
-#include <mbgl/util/time.hpp>
 #include <mbgl/util/util.hpp>
 #include <mbgl/util/string.hpp>
-#include <mbgl/util/parsedate.h>
 
 #include <jni.h>
 
@@ -127,7 +125,7 @@ HTTPAndroidRequest::HTTPAndroidRequest(HTTPAndroidContext* context_, const std::
         if (existingResponse->etag) {
             etagStr = *existingResponse->etag;
         } else if (existingResponse->modified) {
-            modifiedStr = util::rfc1123(SystemClock::to_time_t(*existingResponse->modified));
+            modifiedStr = util::rfc1123(*existingResponse->modified);
         }
     }
 
@@ -197,7 +195,7 @@ void HTTPAndroidRequest::onResponse(JNIEnv* env, int code, jstring /* message */
     }
 
     if (modified != nullptr) {
-        response->modified = SystemClock::from_time_t(parse_date(mbgl::android::std_string_from_jstring(env, modified).c_str()));
+        response->modified = util::parseTimePoint(mbgl::android::std_string_from_jstring(env, modified).c_str());
     }
 
     if (cacheControl != nullptr) {
@@ -205,7 +203,7 @@ void HTTPAndroidRequest::onResponse(JNIEnv* env, int code, jstring /* message */
     }
 
     if (expires != nullptr) {
-        response->expires = SystemClock::from_time_t(parse_date(mbgl::android::std_string_from_jstring(env, expires).c_str()));
+        response->expires = util::parseTimePoint(mbgl::android::std_string_from_jstring(env, expires).c_str());
     }
 
     if (body != nullptr) {
diff --git a/platform/darwin/http_request_nsurl.mm b/platform/darwin/http_request_nsurl.mm
index 68b9863f74..2421c69c66 100644
--- a/platform/darwin/http_request_nsurl.mm
+++ b/platform/darwin/http_request_nsurl.mm
@@ -3,8 +3,6 @@
 #include <mbgl/storage/response.hpp>
 
 #include <mbgl/util/async_task.hpp>
-#include <mbgl/util/time.hpp>
-#include <mbgl/util/parsedate.h>
 #include <mbgl/util/run_loop.hpp>
 
 #import <Foundation/Foundation.h>
@@ -117,7 +115,7 @@ HTTPNSURLRequest::HTTPNSURLRequest(HTTPNSURLContext* context_,
                 [req addValue:@((*existingResponse->etag).c_str())
                      forHTTPHeaderField:@"If-None-Match"];
             } else if (existingResponse->modified) {
-                [req addValue:@(util::rfc1123(SystemClock::to_time_t(*existingResponse->modified)).c_str())
+                [req addValue:@(util::rfc1123(*existingResponse->modified).c_str())
                      forHTTPHeaderField:@"If-Modified-Since"];
             }
         }
@@ -217,12 +215,12 @@ void HTTPNSURLRequest::handleResult(NSData *data, NSURLResponse *res, NSError *e
 
         NSString *expires = [headers objectForKey:@"Expires"];
         if (expires) {
-            response->expires = SystemClock::from_time_t(parse_date([expires UTF8String]));
+            response->expires = util::parseTimePoint([expires UTF8String]);
         }
 
         NSString *last_modified = [headers objectForKey:@"Last-Modified"];
         if (last_modified) {
-            response->modified = SystemClock::from_time_t(parse_date([last_modified UTF8String]));
+            response->modified = util::parseTimePoint([last_modified UTF8String]);
         }
 
         NSString *etag = [headers objectForKey:@"ETag"];
diff --git a/platform/default/http_request_curl.cpp b/platform/default/http_request_curl.cpp
index 078a172c2b..3129dc7a94 100644
--- a/platform/default/http_request_curl.cpp
+++ b/platform/default/http_request_curl.cpp
@@ -3,7 +3,6 @@
 #include <mbgl/storage/response.hpp>
 #include <mbgl/platform/log.hpp>
 
-#include <mbgl/util/time.hpp>
 #include <mbgl/util/util.hpp>
 #include <mbgl/util/run_loop.hpp>
 #include <mbgl/util/string.hpp>
@@ -368,7 +367,7 @@ HTTPCURLRequest::HTTPCURLRequest(HTTPCURLContext* context_, const std::string& u
             headers = curl_slist_append(headers, header.c_str());
         } else if (existingResponse->modified) {
             const std::string time =
-                std::string("If-Modified-Since: ") + util::rfc1123(SystemClock::to_time_t(*existingResponse->modified));
+                std::string("If-Modified-Since: ") + util::rfc1123(*existingResponse->modified);
             headers = curl_slist_append(headers, time.c_str());
         }
     }