Revert of Add: check exploded time is properly converted

base/time/time_win.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.
 
 
 // Windows Timer Primer
 //
 // A good article:  http://www.ddj.com/windows/184416651
 // A good mozilla bug:  http://bugzilla.mozilla.org/show_bug.cgi?id=363258
 //
@@ skipping 217 matching lines @@
   return (period == kMinTimerIntervalHighResMs);
 }
 
 // static
 bool Time::IsHighResolutionTimerInUse() {
   base::AutoLock lock(g_high_res_lock.Get());
   return g_high_res_timer_enabled && g_high_res_timer_count > 0;
 }
 
 // static
-bool Time::FromExploded(bool is_local, const Exploded& exploded, Time* time) {
+Time Time::FromExploded(bool is_local, const Exploded& exploded) {
   // Create the system struct representing our exploded time. It will either be
   // in local time or UTC.
   SYSTEMTIME st;
   st.wYear = static_cast<WORD>(exploded.year);
   st.wMonth = static_cast<WORD>(exploded.month);
   st.wDayOfWeek = static_cast<WORD>(exploded.day_of_week);
   st.wDay = static_cast<WORD>(exploded.day_of_month);
   st.wHour = static_cast<WORD>(exploded.hour);
   st.wMinute = static_cast<WORD>(exploded.minute);
   st.wSecond = static_cast<WORD>(exploded.second);
   st.wMilliseconds = static_cast<WORD>(exploded.millisecond);
 
   FILETIME ft;
   bool success = true;
   // Ensure that it's in UTC.
   if (is_local) {
     SYSTEMTIME utc_st;
-    success = TzSpecificLocalTimeToSystemTime(nullptr, &st, &utc_st) &&
+    success = TzSpecificLocalTimeToSystemTime(NULL, &st, &utc_st) &&
               SystemTimeToFileTime(&utc_st, &ft);
   } else {
     success = !!SystemTimeToFileTime(&st, &ft);
   }
 
   if (!success) {
-    *time = Time(0);
-    return false;
+    NOTREACHED() << "Unable to convert time";
+    return Time(0);
   }
-
-  *time = Time(FileTimeToMicroseconds(ft));
-  return true;
+  return Time(FileTimeToMicroseconds(ft));
 }
 
 void Time::Explode(bool is_local, Exploded* exploded) const {
   if (us_ < 0LL) {
     // We are not able to convert it to FILETIME.
     ZeroMemory(exploded, sizeof(*exploded));
     return;
   }
 
   // FILETIME in UTC.
   FILETIME utc_ft;
   MicrosecondsToFileTime(us_, &utc_ft);
 
   // FILETIME in local time if necessary.
   bool success = true;
   // FILETIME in SYSTEMTIME (exploded).
   SYSTEMTIME st = {0};
   if (is_local) {
     SYSTEMTIME utc_st;
     // We don't use FileTimeToLocalFileTime here, since it uses the current
     // settings for the time zone and daylight saving time. Therefore, if it is
     // daylight saving time, it will take daylight saving time into account,
     // even if the time you are converting is in standard time.
     success = FileTimeToSystemTime(&utc_ft, &utc_st) &&
-              SystemTimeToTzSpecificLocalTime(nullptr, &utc_st, &st);
+              SystemTimeToTzSpecificLocalTime(NULL, &utc_st, &st);
   } else {
     success = !!FileTimeToSystemTime(&utc_ft, &st);
   }
 
   if (!success) {
     NOTREACHED() << "Unable to convert time, don't know why";
     ZeroMemory(exploded, sizeof(*exploded));
     return;
   }
 
@@ skipping 306 matching lines @@
 TimeTicks TimeTicks::FromQPCValue(LONGLONG qpc_value) {
   return TimeTicks() + QPCValueToTimeDelta(qpc_value);
 }
 
 // TimeDelta ------------------------------------------------------------------
 
 // static
 TimeDelta TimeDelta::FromQPCValue(LONGLONG qpc_value) {
   return QPCValueToTimeDelta(qpc_value);
 }