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

webkit/media/android/media_source_delegate.cc

 // Copyright (c) 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 "webkit/media/android/media_source_delegate.h"
 
 #include "base/message_loop_proxy.h"
 #include "base/strings/string_number_conversions.h"
 #include "media/base/android/demuxer_stream_player_params.h"
 #include "media/base/bind_to_loop.h"
@@ skipping 355 matching lines @@
 
   if (proxy_)
     proxy_->ReadFromDemuxerAck(player_id_, *params);
   params->access_units.resize(0);
 }
 
 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(
     media::PipelineStatus status) {
   DVLOG(1) << "MediaSourceDelegate::OnDemuxerInitDone(" << status << ") : "
            << player_id_;
   if (status != media::PIPELINE_OK) {
     OnDemuxerError(status);
     return;
   }
@@ skipping 117 matching lines @@
 void MediaSourceDelegate::OnDecryptorReady(media::Decryptor* decryptor) {}
 
 scoped_ptr<media::TextTrack> MediaSourceDelegate::OnAddTextTrack(
     media::TextKind kind,
     const std::string& label,
     const std::string& language) {
   return scoped_ptr<media::TextTrack>();
 }
 
 }  // namespace webkit_media