Revert 132965 - this change seems to break media_unittests

media/filters/pipeline_integration_test.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 "media/filters/pipeline_integration_test_base.h"
 
 #include "base/bind.h"
 #include "media/base/test_data_util.h"
 #include "media/filters/chunk_demuxer_client.h"
 
 namespace media {
 
 // Key ID of the video track in test file "bear-320x240-encrypted.webm".
 static const unsigned char kKeyId[] =
     "\x11\xa5\x18\x37\xc4\x73\x84\x03\xe5\xe6\x57\xed\x8e\x06\xd9\x7c";
 
-static const char* kSourceId = "SourceId";
-static const char* kDefaultSourceType = "video/webm; codecs=\"vp8, vorbis\"";
-
 // Helper class that emulates calls made on the ChunkDemuxer by the
 // Media Source API.
 class MockMediaSource : public ChunkDemuxerClient {
  public:
   MockMediaSource(const std::string& filename, int initial_append_size)
       : url_(GetTestDataURL(filename)),
         current_position_(0),
         initial_append_size_(initial_append_size) {
     ReadTestDataFile(filename, &file_data_, &file_data_size_);
 
@@ skipping 12 matching lines @@
     DCHECK_LT(new_position, file_data_size_);
     current_position_ = new_position;
 
     AppendData(seek_append_size);
   }
 
   void AppendData(int size) {
     DCHECK(chunk_demuxer_.get());
     DCHECK_LT(current_position_, file_data_size_);
     DCHECK_LE(current_position_ + size, file_data_size_);
-    DCHECK(chunk_demuxer_->AppendData(kSourceId,
-                                      file_data_.get() + current_position_,
-                                      size));
+    chunk_demuxer_->AppendData(file_data_.get() + current_position_, size);
     current_position_ += size;
   }
 
   void EndOfStream() {
     chunk_demuxer_->EndOfStream(PIPELINE_OK);
   }
 
   void Abort() {
     if (!chunk_demuxer_.get())
       return;
     chunk_demuxer_->Shutdown();
   }
 
   // ChunkDemuxerClient methods.
   virtual void DemuxerOpened(ChunkDemuxer* demuxer) {
     chunk_demuxer_ = demuxer;
-    DCHECK_EQ(chunk_demuxer_->AddId(kSourceId, kDefaultSourceType),
-              ChunkDemuxer::kOk);
     AppendData(initial_append_size_);
   }
 
   virtual void DemuxerClosed() {
     chunk_demuxer_ = NULL;
   }
 
  private:
   std::string url_;
   scoped_array<uint8> file_data_;
@@ skipping 130 matching lines @@
 
 // Verify video decoder & renderer can handle aborted demuxer reads.
 TEST_F(PipelineIntegrationTest, ChunkDemuxerAbortRead_VideoOnly) {
   ASSERT_TRUE(TestSeekDuringRead("bear-320x240-video-only.webm", 32768,
                                  base::TimeDelta::FromMilliseconds(200),
                                  base::TimeDelta::FromMilliseconds(1668),
                                  0x1C896, 65536));
 }
 
 }  // namespace media