Fix MediaPlayerDelegate error handling so it passes the webkitmediasource-errors.html LayoutTest.

webkit/media/android/media_source_delegate.cc

Index: webkit/media/android/media_source_delegate.cc
diff --git a/webkit/media/android/media_source_delegate.cc b/webkit/media/android/media_source_delegate.cc
index 03dac325e543990f07c1b8e88a9cf1dcf2f449b6..1b63ed1da9f571c2629067b3abc3d2a0d1afa025 100644
--- a/webkit/media/android/media_source_delegate.cc
+++ b/webkit/media/android/media_source_delegate.cc
@@ -373,14 +373,8 @@ void MediaSourceDelegate::OnDemuxerError(
     media::PipelineStatus status) {
   DVLOG(1) << "MediaSourceDelegate::OnDemuxerError(" << status << ") : "
            << player_id_;
-  if (status != media::PIPELINE_OK) {
-    DCHECK(status == media::DEMUXER_ERROR_COULD_NOT_OPEN ||
-           status == media::DEMUXER_ERROR_COULD_NOT_PARSE ||
-           status == media::DEMUXER_ERROR_NO_SUPPORTED_STREAMS)
-        << "Unexpected error from demuxer: " << static_cast<int>(status);
-    if (!update_network_state_cb_.is_null())
-      update_network_state_cb_.Run(WebMediaPlayer::NetworkStateFormatError);
-  }
+  if (status != media::PIPELINE_OK && !update_network_state_cb_.is_null())
+    update_network_state_cb_.Run(PipelineErrorToNetworkState(status));
 }
 
 void MediaSourceDelegate::OnDemuxerInitDone(