Fix media code to work with new ffmpeg.

media/filters/ffmpeg_demuxer_unittest.cc

 // Copyright (c) 2011 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 <deque>
 
 #include "base/file_path.h"
 #include "base/path_service.h"
 #include "base/threading/thread.h"
 #include "media/base/filters.h"
@@ skipping 126 matching lines @@
   StrictMock<MockDemuxerHost> host_;
   MessageLoop message_loop_;
 
   int64 current_read_position_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FFmpegDemuxerTest);
 };
 
 TEST_F(FFmpegDemuxerTest, Initialize_OpenFails) {
-  // Simulate av_open_input_file() failing.
+  // Simulate avformat_open_input() failing.
   EXPECT_CALL(host_, SetCurrentReadPosition(_));
   demuxer_->Initialize(CreateDataSource("ten_byte_file"),
                        NewExpectedStatusCB(DEMUXER_ERROR_COULD_NOT_OPEN));
 
   message_loop_.RunAllPending();
 }
 
 // TODO(acolwell): Uncomment this test when we discover a file that passes
-// av_open_input_file(), but has av_find_stream_info() fail.
+// avformat_open_input(), but has avformat_find_stream_info() fail.
 //
 //TEST_F(FFmpegDemuxerTest, Initialize_ParseFails) {
 //  demuxer_->Initialize(
 //      CreateDataSource("find_stream_info_fail.webm"),
 //      NewExpectedStatusCB(DEMUXER_ERROR_COULD_NOT_PARSE));
 //  message_loop_.RunAllPending();
 //}
 
 TEST_F(FFmpegDemuxerTest, Initialize_NoStreams) {
   // Open a file with no streams whatsoever.
@@ skipping 465 matching lines @@
 
 TEST_F(FFmpegDemuxerTest, GetBitrate_UnsetInContainer_KnownSize) {
   EXPECT_TRUE(VideoHasValidBitrate("bear-320x240.webm", false));
 }
 
 TEST_F(FFmpegDemuxerTest, GetBitrate_SetInContainer_NoFileSize) {
   EXPECT_TRUE(VideoHasValidBitrate("bear.ogv", true));
 }
 
 TEST_F(FFmpegDemuxerTest, GetBitrate_UnsetInContainer_NoFileSize) {
-  EXPECT_FALSE(VideoHasValidBitrate("bear-320x240.webm", true));
+  EXPECT_TRUE(VideoHasValidBitrate("bear-320x240.webm", true));
 }
 
 TEST_F(FFmpegDemuxerTest, ProtocolGetSetPosition) {
   scoped_refptr<DataSource> data_source = CreateDataSource("bear-320x240.webm");
   InitializeDemuxer(data_source);
 
   InSequence s;
 
   int64 size;
   int64 position;
@@ skipping 84 matching lines @@
   message_loop_.RunAllPending();
   EXPECT_TRUE(reader->called());
   ValidateBuffer(FROM_HERE, reader->buffer(), 1740, 2436000);
 
   // Manually release the last reference to the buffer and verify it was freed.
   reader->Reset();
   message_loop_.RunAllPending();
 }
 
 }  // namespace media