Fix expiry time conversion in ContentDecryptorDelegate

content/renderer/pepper/content_decryptor_delegate.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.
 
 #include "content/renderer/pepper/content_decryptor_delegate.h"
 
 #include <string.h>
 #include <utility>
 #include <vector>
 
@@ skipping 812 matching lines @@
 
 void ContentDecryptorDelegate::OnSessionExpirationChange(
     PP_Var session_id,
     PP_Time new_expiry_time) {
   if (session_expiration_update_cb_.is_null())
     return;
 
   StringVar* session_id_string = StringVar::FromPPVar(session_id);
   DCHECK(session_id_string);
 
-  session_expiration_update_cb_.Run(session_id_string->value(),
-                                    ppapi::PPTimeToTime(new_expiry_time));
+  // PPTimeToTime() converts exact 0 to base::Time::UnixEpoch, which is not
+  // desired here. We want to convert 0.0 to a null base::Time.
+  base::Time expiry_time;
+  if (new_expiry_time != 0.0)
+    expiry_time = ppapi::PPTimeToTime(new_expiry_time);
+
+  session_expiration_update_cb_.Run(session_id_string->value(), expiry_time);
 }
 
 void ContentDecryptorDelegate::OnSessionClosed(PP_Var session_id) {
   StringVar* session_id_string = StringVar::FromPPVar(session_id);
   DCHECK(session_id_string);
 
   cdm_session_tracker_.RemoveSession(session_id_string->value());
   if (!session_closed_cb_.is_null())
     session_closed_cb_.Run(session_id_string->value());
 }
@@ skipping 430 matching lines @@
 
   if (!video_decode_cb_.is_null())
     video_decode_cb_.ResetAndReturn().Run(media::Decryptor::kError, NULL);
 
   cdm_promise_adapter_.Clear();
 
   cdm_session_tracker_.CloseRemainingSessions(session_closed_cb_);
 }
 
 }  // namespace content