Remove MediaFormat once and for all.

media/filters/adaptive_demuxer.cc

Index: media/filters/adaptive_demuxer.cc
diff --git a/media/filters/adaptive_demuxer.cc b/media/filters/adaptive_demuxer.cc
index 8f5750df0d98a2ce55c06ba6c2e97f5cf7f2a74c..f08e32dec88d1ece1c969fd4d16463dcbf79497e 100644
--- a/media/filters/adaptive_demuxer.cc
+++ b/media/filters/adaptive_demuxer.cc
@@ -165,7 +165,6 @@ void AdaptiveDemuxerStream::DCheckSanity() {
 
   bool non_null_stream_seen = false;
   Type type = DemuxerStream::UNKNOWN;
-  const MediaFormat* media_format = NULL;
   for (size_t i = 0; i < streams_.size(); ++i) {
     if (!streams_[i])
       continue;
@@ -173,10 +172,8 @@ void AdaptiveDemuxerStream::DCheckSanity() {
     if (!non_null_stream_seen) {
       non_null_stream_seen = true;
       type = streams_[i]->type();
-      media_format = &streams_[i]->media_format();
     } else {
       DCHECK_EQ(streams_[i]->type(), type);
-      DCHECK(streams_[i]->media_format() == *media_format);
     }
   }
 }
@@ -223,10 +220,6 @@ DemuxerStream::Type AdaptiveDemuxerStream::type() {
   return current_stream()->type();
 }
 
-const MediaFormat& AdaptiveDemuxerStream::media_format() {
-  return current_stream()->media_format();
-}
-
 void AdaptiveDemuxerStream::EnableBitstreamConverter() {
   {
     base::AutoLock auto_lock(lock_);