Revert 132965 - this change seems to break media_unittests

webkit/media/webmediaplayer_proxy.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 "webkit/media/webmediaplayer_proxy.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop_proxy.h"
 #include "media/base/pipeline_status.h"
@@ skipping 169 matching lines @@
 void WebMediaPlayerProxy::DemuxerClosed() {
   render_loop_->PostTask(FROM_HERE, base::Bind(
       &WebMediaPlayerProxy::DemuxerClosedTask, this));
 }
 
 void WebMediaPlayerProxy::DemuxerFlush() {
   if (chunk_demuxer_.get())
     chunk_demuxer_->FlushData();
 }
 
-media::ChunkDemuxer::Status WebMediaPlayerProxy::DemuxerAddId(
-    const std::string& id,
-    const std::string& type) {
-  return chunk_demuxer_->AddId(id, type);
-}
-
-bool WebMediaPlayerProxy::DemuxerRemoveId(const std::string& id) {
-  return chunk_demuxer_->RemoveId(id);
-}
-
-bool WebMediaPlayerProxy::DemuxerAppend(const std::string& id,
-                                        const uint8* data,
-                                        size_t length) {
-  return chunk_demuxer_->AppendData(id, data, length);
+bool WebMediaPlayerProxy::DemuxerAppend(const uint8* data, size_t length) {
+  if (chunk_demuxer_.get())
+    return chunk_demuxer_->AppendData(data, length);
+  return false;
 }
 
 void WebMediaPlayerProxy::DemuxerEndOfStream(media::PipelineStatus status) {
-  chunk_demuxer_->EndOfStream(status);
+  if (chunk_demuxer_.get())
+    chunk_demuxer_->EndOfStream(status);
 }
 
 void WebMediaPlayerProxy::DemuxerShutdown() {
   if (chunk_demuxer_.get())
     chunk_demuxer_->Shutdown();
 }
 
 void WebMediaPlayerProxy::DemuxerOpenedTask(
     const scoped_refptr<media::ChunkDemuxer>& demuxer) {
   DCHECK(render_loop_->BelongsToCurrentThread());
   chunk_demuxer_ = demuxer;
   if (webmediaplayer_)
     webmediaplayer_->OnDemuxerOpened();
 }
 
 void WebMediaPlayerProxy::DemuxerClosedTask() {
   chunk_demuxer_ = NULL;
 }
 
 }  // namespace webkit_media