Merge from Chromium at DEPS revision 257591

This commit was generated by merge_to_master.py.

Change-Id: I0010df2ec3fbb5d4947cd026de2feb150ce7a6b5

1 files changed, 14 insertions, 3 deletions

diff --git a/media/base/media_log.cc b/media/base/media_log.cc
index e791b441f4..c689d7a46c 100644
--- a/media/base/media_log.cc
+++ b/media/base/media_log.cc
@@ -97,8 +97,6 @@ const char* MediaLog::PipelineStatusToString(PipelineStatus status) {
       return "demuxer: no supported streams";
     case DECODER_ERROR_NOT_SUPPORTED:
       return "decoder: not supported";
-    case PIPELINE_STATUS_MAX:
-      NOTREACHED();
   }
   NOTREACHED();
   return NULL;
@@ -143,7 +141,10 @@ scoped_ptr<MediaLogEvent> MediaLog::CreateStringEvent(
 scoped_ptr<MediaLogEvent> MediaLog::CreateTimeEvent(
     MediaLogEvent::Type type, const char* property, base::TimeDelta value) {
   scoped_ptr<MediaLogEvent> event(CreateEvent(type));
-  event->params.SetDouble(property, value.InSecondsF());
+  if (value.is_max())
+    event->params.SetString(property, "unknown");
+  else
+    event->params.SetDouble(property, value.InSecondsF());
   return event.Pass();
 }
 
@@ -230,4 +231,14 @@ void MediaLog::SetBooleanProperty(
   AddEvent(event.Pass());
 }
 
+void MediaLog::SetTimeProperty(
+    const char* key, base::TimeDelta value) {
+  scoped_ptr<MediaLogEvent> event(CreateEvent(MediaLogEvent::PROPERTY_CHANGE));
+  if (value.is_max())
+    event->params.SetString(key, "unknown");
+  else
+    event->params.SetDouble(key, value.InSecondsF());
+  AddEvent(event.Pass());
+}
+
 }  //namespace media