Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(927)

Unified Diff: media/filters/pipeline_integration_test.cc

Issue 10123005: Revert 132965 - this change seems to break media_unittests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/filters/chunk_demuxer_unittest.cc ('k') | webkit/media/webmediaplayer_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/pipeline_integration_test.cc
===================================================================
--- media/filters/pipeline_integration_test.cc (revision 132968)
+++ media/filters/pipeline_integration_test.cc (working copy)
@@ -14,9 +14,6 @@
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 {
@@ -49,9 +46,7 @@
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;
}
@@ -68,8 +63,6 @@
// ChunkDemuxerClient methods.
virtual void DemuxerOpened(ChunkDemuxer* demuxer) {
chunk_demuxer_ = demuxer;
- DCHECK_EQ(chunk_demuxer_->AddId(kSourceId, kDefaultSourceType),
- ChunkDemuxer::kOk);
AppendData(initial_append_size_);
}
« no previous file with comments | « media/filters/chunk_demuxer_unittest.cc ('k') | webkit/media/webmediaplayer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698