Switch to AVIO instead of a custom FFmpeg URLProtocol handler.

media/filters/ffmpeg_demuxer_unittest.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 <algorithm>
 #include <deque>
 #include <string>
 
 #include "base/bind.h"
 #include "base/file_path.h"
@@ skipping 123 matching lines @@
     return static_cast<FFmpegDemuxerStream*>(stream)->stopped_;
   }
 
   // Fixture members.
   scoped_refptr<FileDataSource> data_source_;
   scoped_refptr<FFmpegDemuxer> demuxer_;
   StrictMock<MockDemuxerHost> host_;
   MessageLoop message_loop_;
 
   AVFormatContext* format_context() {
-    return demuxer_->format_context_;
+    return demuxer_->glue_->format_context();
   }
 
   void ReadUntilEndOfStream() {
     // We should expect an end of stream buffer.
     scoped_refptr<DemuxerStream> audio =
         demuxer_->GetStream(DemuxerStream::AUDIO);
 
     bool got_eos_buffer = false;
     const int kMaxBuffers = 170;
     for (int i = 0; !got_eos_buffer && i < kMaxBuffers; i++) {
@@ skipping 379 matching lines @@
   InitializeDemuxer();
 
   // Set read head to zero as Initialize() will have parsed a bit of the file.
   int64 position = 0;
   EXPECT_TRUE(demuxer_->SetPosition(0));
   EXPECT_TRUE(demuxer_->GetPosition(&position));
   EXPECT_EQ(0, position);
 
   // Read 32 bytes from offset zero and verify position.
   uint8 buffer[32];
-  EXPECT_EQ(32u, demuxer_->Read(32, buffer));
+  EXPECT_EQ(32, demuxer_->Read(32, buffer));
   EXPECT_TRUE(demuxer_->GetPosition(&position));
   EXPECT_EQ(32, position);
 
   // Read an additional 32 bytes and verify position.
-  EXPECT_EQ(32u, demuxer_->Read(32, buffer));
+  EXPECT_EQ(32, demuxer_->Read(32, buffer));
   EXPECT_TRUE(demuxer_->GetPosition(&position));
   EXPECT_EQ(64, position);
 
   // Seek to end and read until EOF.
   int64 size = 0;
   EXPECT_TRUE(demuxer_->GetSize(&size));
   EXPECT_TRUE(demuxer_->SetPosition(size - 48));
-  EXPECT_EQ(32u, demuxer_->Read(32, buffer));
+  EXPECT_EQ(32, demuxer_->Read(32, buffer));
   EXPECT_TRUE(demuxer_->GetPosition(&position));
   EXPECT_EQ(size - 16, position);
 
-  EXPECT_EQ(16u, demuxer_->Read(32, buffer));
+  EXPECT_EQ(16, demuxer_->Read(32, buffer));
   EXPECT_TRUE(demuxer_->GetPosition(&position));
   EXPECT_EQ(size, position);
 
-  EXPECT_EQ(0u, demuxer_->Read(32, buffer));
+  EXPECT_EQ(0, demuxer_->Read(32, buffer));
   EXPECT_TRUE(demuxer_->GetPosition(&position));
   EXPECT_EQ(size, position);
 
   demuxer_->Stop(NewExpectedClosure());
   message_loop_.RunAllPending();
 }
 
 TEST_F(FFmpegDemuxerTest, ProtocolGetSetPosition) {
   CreateDemuxer("bear-320x240.webm");
   InitializeDemuxer();
@@ skipping 115 matching lines @@
 TEST_F(FFmpegDemuxerTest, UnsupportedVideoSupportedAudioDemux) {
   CreateDemuxer("vorbis_audio_wmv_video.mkv");
   InitializeDemuxer();
 
   // Ensure the expected streams are present.
   EXPECT_FALSE(demuxer_->GetStream(DemuxerStream::VIDEO));
   EXPECT_TRUE(demuxer_->GetStream(DemuxerStream::AUDIO));
 }
 
 }  // namespace media