media: Fix expiry time convertion from base::Time to JS time

media/blink/webcontentdecryptionmodulesession_impl.cc

 // Copyright 2013 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 "webcontentdecryptionmodulesession_impl.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
@@ skipping 476 matching lines @@
     keys[i].setSystemCode(key_info->system_code);
   }
 
   // Now send the event to blink.
   client_->keysStatusesChange(keys, has_additional_usable_key);
 }
 
 void WebContentDecryptionModuleSessionImpl::OnSessionExpirationUpdate(
     base::Time new_expiry_time) {
   DCHECK(thread_checker_.CalledOnValidThread());
-  client_->expirationChanged(new_expiry_time.ToJsTime());
+  // The check works around an issue in base::Time that converts null base::Time
+  // to |1601-01-01 00:00:00 UTC| in ToJsTime(). See http://crbug.com/679079
+  client_->expirationChanged(new_expiry_time.is_null()
+                                 ? std::numeric_limits<double>::quiet_NaN()
+                                 : new_expiry_time.ToJsTime());
 }
 
 void WebContentDecryptionModuleSessionImpl::OnSessionClosed() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   // Only send one closed event to blink.
   if (is_closed_)
     return;
 
   is_closed_ = true;
@@ skipping 12 matching lines @@
 
   DCHECK(session_id_.empty()) << "Session ID may not be changed once set.";
   session_id_ = session_id;
   *status =
       adapter_->RegisterSession(session_id_, weak_ptr_factory_.GetWeakPtr())
           ? SessionInitStatus::NEW_SESSION
           : SessionInitStatus::SESSION_ALREADY_EXISTS;
 }
 
 }  // namespace media