Enable AudioDecoder unit tests on Android

media/filters/audio_decoder_unittest.cc

Index: media/filters/audio_decoder_unittest.cc
diff --git a/media/filters/audio_decoder_unittest.cc b/media/filters/audio_decoder_unittest.cc
index 9eae8fa851c8fa7eea37dc9380302270de52b2e1..122548b3676f047c611ee62e2f4b35178610a2e4 100644
--- a/media/filters/audio_decoder_unittest.cc
+++ b/media/filters/audio_decoder_unittest.cc
@@ -3,16 +3,13 @@
 // found in the LICENSE file.
 
 #include <stddef.h>
-#include <stdint.h>
 
 #include <deque>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/format_macros.h"
-#include "base/macros.h"
 #include "base/md5.h"
-#include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/sys_byteorder.h"
@@ -26,46 +23,18 @@
 #include "media/base/test_helpers.h"
 #include "media/base/timestamp_constants.h"
 #include "media/ffmpeg/ffmpeg_common.h"
+#include "media/filters/audio_decoder_test.h"
 #include "media/filters/audio_file_reader.h"
 #include "media/filters/ffmpeg_audio_decoder.h"
 #include "media/filters/in_memory_url_protocol.h"
 #include "media/filters/opus_audio_decoder.h"
-#include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {
 
+// AudioDecoderTest implementation.
+
 // The number of packets to read and then decode from each file.
 static const size_t kDecodeRuns = 3;
-static const uint8_t kOpusExtraData[] = {
-    0x4f, 0x70, 0x75, 0x73, 0x48, 0x65, 0x61, 0x64, 0x01, 0x02,
-    // The next two bytes represent the codec delay.
-    0x00, 0x00, 0x80, 0xbb, 0x00, 0x00, 0x00, 0x00, 0x00};
-
-enum AudioDecoderType {
-  FFMPEG,
-  OPUS,
-};
-
-struct DecodedBufferExpectations {
-  const int64_t timestamp;
-  const int64_t duration;
-  const char* hash;
-};
-
-struct DecoderTestData {
-  const AudioDecoderType decoder_type;
-  const AudioCodec codec;
-  const char* filename;
-  const DecodedBufferExpectations* expectations;
-  const int first_packet_pts;
-  const int samples_per_second;
-  const ChannelLayout channel_layout;
-};
-
-// Tells gtest how to print our DecoderTestData structure.
-std::ostream& operator<<(std::ostream& os, const DecoderTestData& data) {
-  return os << data.filename;
-}
 
 // Marks negative timestamp buffers for discard or transfers FFmpeg's built in
 // discard metadata in favor of setting DiscardPadding on the DecoderBuffer.
@@ -98,225 +67,199 @@ static void SetDiscardPadding(AVPacket* packet,
       base::TimeDelta()));
 }
 
-class AudioDecoderTest : public testing::TestWithParam<DecoderTestData> {
- public:
-  AudioDecoderTest()
-      : pending_decode_(false),
-        pending_reset_(false),
-        last_decode_status_(AudioDecoder::kDecodeError) {
-    switch (GetParam().decoder_type) {
-      case FFMPEG:
-        decoder_.reset(new FFmpegAudioDecoder(message_loop_.task_runner(),
-                                              new MediaLog()));
-        break;
-      case OPUS:
-        decoder_.reset(
-            new OpusAudioDecoder(message_loop_.task_runner()));
-        break;
-    }
-  }
-
-  virtual ~AudioDecoderTest() {
-    EXPECT_FALSE(pending_decode_);
-    EXPECT_FALSE(pending_reset_);
-  }
-
- protected:
-  void DecodeBuffer(const scoped_refptr<DecoderBuffer>& buffer) {
-    ASSERT_FALSE(pending_decode_);
-    pending_decode_ = true;
-    last_decode_status_ = AudioDecoder::kDecodeError;
-    decoder_->Decode(
-        buffer,
-        base::Bind(&AudioDecoderTest::DecodeFinished, base::Unretained(this)));
-    base::RunLoop().RunUntilIdle();
-    ASSERT_FALSE(pending_decode_);
-  }
-
-  void SendEndOfStream() {
-    DecodeBuffer(DecoderBuffer::CreateEOSBuffer());
-  }
-
-  void Initialize() {
-    // Load the test data file.
-    data_ = ReadTestDataFile(GetParam().filename);
-    protocol_.reset(
-        new InMemoryUrlProtocol(data_->data(), data_->data_size(), false));
-    reader_.reset(new AudioFileReader(protocol_.get()));
-    ASSERT_TRUE(reader_->OpenDemuxerForTesting());
-
-    // Load the first packet and check its timestamp.
-    AVPacket packet;
-    ASSERT_TRUE(reader_->ReadPacketForTesting(&packet));
-    EXPECT_EQ(GetParam().first_packet_pts, packet.pts);
-    start_timestamp_ = ConvertFromTimeBase(
-        reader_->GetAVStreamForTesting()->time_base, packet.pts);
-    av_packet_unref(&packet);
-
-    // Seek back to the beginning.
-    ASSERT_TRUE(reader_->SeekForTesting(start_timestamp_));
-
-    AudioDecoderConfig config;
-    ASSERT_TRUE(AVCodecContextToAudioDecoderConfig(
-        reader_->codec_context_for_testing(), false, &config));
-
-    EXPECT_EQ(GetParam().codec, config.codec());
-    EXPECT_EQ(GetParam().samples_per_second, config.samples_per_second());
-    EXPECT_EQ(GetParam().channel_layout, config.channel_layout());
-
-    InitializeDecoder(config);
-  }
-
-  void InitializeDecoder(const AudioDecoderConfig& config) {
-    InitializeDecoderWithResult(config, true);
-  }
-
-  void InitializeDecoderWithResult(const AudioDecoderConfig& config,
-                                   bool success) {
-    decoder_->Initialize(
-        config, nullptr, NewExpectedBoolCB(success),
-        base::Bind(&AudioDecoderTest::OnDecoderOutput, base::Unretained(this)));
-    base::RunLoop().RunUntilIdle();
+AudioDecoderTest::AudioDecoderTest()
+    : pending_decode_(false),
+      pending_reset_(false),
+      last_decode_status_(AudioDecoder::kDecodeError) {
+  switch (GetParam().decoder_type) {
+    case FFMPEG:
+      decoder_.reset(
+          new FFmpegAudioDecoder(message_loop_.task_runner(), new MediaLog()));
+      break;
+    case OPUS:
+      decoder_.reset(new OpusAudioDecoder(message_loop_.task_runner()));
+      break;
   }
+}
 
-  void Decode() {
-    AVPacket packet;
-    ASSERT_TRUE(reader_->ReadPacketForTesting(&packet));
-
-    // Split out packet metadata before making a copy.
-    av_packet_split_side_data(&packet);
-
-    scoped_refptr<DecoderBuffer> buffer =
-        DecoderBuffer::CopyFrom(packet.data, packet.size);
-    buffer->set_timestamp(ConvertFromTimeBase(
-        reader_->GetAVStreamForTesting()->time_base, packet.pts));
-    buffer->set_duration(ConvertFromTimeBase(
-        reader_->GetAVStreamForTesting()->time_base, packet.duration));
-    if (packet.flags & AV_PKT_FLAG_KEY)
-      buffer->set_is_key_frame(true);
-
-    // Don't set discard padding for Opus, it already has discard behavior set
-    // based on the codec delay in the AudioDecoderConfig.
-    if (GetParam().decoder_type == FFMPEG)
-      SetDiscardPadding(&packet, buffer, GetParam().samples_per_second);
-
-    // DecodeBuffer() shouldn't need the original packet since it uses the copy.
-    av_packet_unref(&packet);
-    DecodeBuffer(buffer);
-  }
+AudioDecoderTest::~AudioDecoderTest() {
+  EXPECT_FALSE(pending_decode_);
+  EXPECT_FALSE(pending_reset_);
+}
 
-  void Reset() {
-    ASSERT_FALSE(pending_reset_);
-    pending_reset_ = true;
-    decoder_->Reset(
-        base::Bind(&AudioDecoderTest::ResetFinished, base::Unretained(this)));
-    base::RunLoop().RunUntilIdle();
-    ASSERT_FALSE(pending_reset_);
-  }
+void AudioDecoderTest::DecodeBuffer(
+    const scoped_refptr<DecoderBuffer>& buffer) {
+  ASSERT_FALSE(pending_decode_);
+  pending_decode_ = true;
+  last_decode_status_ = AudioDecoder::kDecodeError;
+  decoder_->Decode(buffer, base::Bind(&AudioDecoderTest::DecodeFinished,
+                                      base::Unretained(this)));
+  base::RunLoop().RunUntilIdle();
+  ASSERT_FALSE(pending_decode_);
+}
 
-  void Seek(base::TimeDelta seek_time) {
-    Reset();
-    decoded_audio_.clear();
-    ASSERT_TRUE(reader_->SeekForTesting(seek_time));
-  }
+void AudioDecoderTest::SendEndOfStream() {
+  DecodeBuffer(DecoderBuffer::CreateEOSBuffer());
+}
 
-  void OnDecoderOutput(const scoped_refptr<AudioBuffer>& buffer) {
-    EXPECT_FALSE(buffer->end_of_stream());
-    decoded_audio_.push_back(buffer);
-  }
+void AudioDecoderTest::Initialize() {
+  // Load the test data file.
+  data_ = ReadTestDataFile(GetParam().filename);
+  protocol_.reset(
+      new InMemoryUrlProtocol(data_->data(), data_->data_size(), false));
+  reader_.reset(new AudioFileReader(protocol_.get()));
+  ASSERT_TRUE(reader_->OpenDemuxerForTesting());
+
+  // Load the first packet and check its timestamp.
+  AVPacket packet;
+  ASSERT_TRUE(reader_->ReadPacketForTesting(&packet));
+  EXPECT_EQ(GetParam().first_packet_pts, packet.pts);
+  start_timestamp_ = ConvertFromTimeBase(
+      reader_->GetAVStreamForTesting()->time_base, packet.pts);
+  av_packet_unref(&packet);
+
+  // Seek back to the beginning.
+  ASSERT_TRUE(reader_->SeekForTesting(start_timestamp_));
+
+  AudioDecoderConfig config;
+  ASSERT_TRUE(AVCodecContextToAudioDecoderConfig(
+      reader_->codec_context_for_testing(), false, &config));
+
+  EXPECT_EQ(GetParam().codec, config.codec());
+  EXPECT_EQ(GetParam().samples_per_second, config.samples_per_second());
+  EXPECT_EQ(GetParam().channel_layout, config.channel_layout());
+
+  InitializeDecoder(config);
+}
 
-  void DecodeFinished(AudioDecoder::Status status) {
-    EXPECT_TRUE(pending_decode_);
-    EXPECT_FALSE(pending_reset_);
-    pending_decode_ = false;
-    last_decode_status_ = status;
-  }
+void AudioDecoderTest::InitializeDecoder(const AudioDecoderConfig& config) {
+  InitializeDecoderWithResult(config, true);
+}
 
-  void ResetFinished() {
-    EXPECT_TRUE(pending_reset_);
-    EXPECT_FALSE(pending_decode_);
-    pending_reset_ = false;
-  }
+void AudioDecoderTest::InitializeDecoderWithResult(
+    const AudioDecoderConfig& config,
+    bool success) {
+  decoder_->Initialize(
+      config, nullptr, NewExpectedBoolCB(success),
+      base::Bind(&AudioDecoderTest::OnDecoderOutput, base::Unretained(this)));
+  base::RunLoop().RunUntilIdle();
+}
 
-  // Generates an MD5 hash of the audio signal.  Should not be used for checks
-  // across platforms as audio varies slightly across platforms.
-  std::string GetDecodedAudioMD5(size_t i) {
-    CHECK_LT(i, decoded_audio_.size());
-    const scoped_refptr<AudioBuffer>& buffer = decoded_audio_[i];
-
-    scoped_ptr<AudioBus> output =
-        AudioBus::Create(buffer->channel_count(), buffer->frame_count());
-    buffer->ReadFrames(buffer->frame_count(), 0, 0, output.get());
-
-    base::MD5Context context;
-    base::MD5Init(&context);
-    for (int ch = 0; ch < output->channels(); ++ch) {
-      base::MD5Update(
-          &context,
-          base::StringPiece(reinterpret_cast<char*>(output->channel(ch)),
-                            output->frames() * sizeof(*output->channel(ch))));
-    }
-    base::MD5Digest digest;
-    base::MD5Final(&digest, &context);
-    return base::MD5DigestToBase16(digest);
-  }
+void AudioDecoderTest::Decode() {
+  AVPacket packet;
+  ASSERT_TRUE(reader_->ReadPacketForTesting(&packet));
+
+  // Split out packet metadata before making a copy.
+  av_packet_split_side_data(&packet);
+
+  scoped_refptr<DecoderBuffer> buffer =
+      DecoderBuffer::CopyFrom(packet.data, packet.size);
+  buffer->set_timestamp(ConvertFromTimeBase(
+      reader_->GetAVStreamForTesting()->time_base, packet.pts));
+  buffer->set_duration(ConvertFromTimeBase(
+      reader_->GetAVStreamForTesting()->time_base, packet.duration));
+  if (packet.flags & AV_PKT_FLAG_KEY)
+    buffer->set_is_key_frame(true);
+
+  // Don't set discard padding for Opus, it already has discard behavior set
+  // based on the codec delay in the AudioDecoderConfig.
+  if (GetParam().decoder_type == FFMPEG)
+    SetDiscardPadding(&packet, buffer, GetParam().samples_per_second);
+
+  // DecodeBuffer() shouldn't need the original packet since it uses the copy.
+  av_packet_unref(&packet);
+  DecodeBuffer(buffer);
+}
 
-  void ExpectDecodedAudio(size_t i, const std::string& exact_hash) {
-    CHECK_LT(i, decoded_audio_.size());
-    const scoped_refptr<AudioBuffer>& buffer = decoded_audio_[i];
+void AudioDecoderTest::Reset() {
+  ASSERT_FALSE(pending_reset_);
+  pending_reset_ = true;
+  decoder_->Reset(
+      base::Bind(&AudioDecoderTest::ResetFinished, base::Unretained(this)));
+  base::RunLoop().RunUntilIdle();
+  ASSERT_FALSE(pending_reset_);
+}
 
-    const DecodedBufferExpectations& sample_info = GetParam().expectations[i];
-    EXPECT_EQ(sample_info.timestamp, buffer->timestamp().InMicroseconds());
-    EXPECT_EQ(sample_info.duration, buffer->duration().InMicroseconds());
-    EXPECT_FALSE(buffer->end_of_stream());
+void AudioDecoderTest::Seek(base::TimeDelta seek_time) {
+  Reset();
+  decoded_audio_.clear();
+  ASSERT_TRUE(reader_->SeekForTesting(seek_time));
+}
 
-    scoped_ptr<AudioBus> output =
-        AudioBus::Create(buffer->channel_count(), buffer->frame_count());
-    buffer->ReadFrames(buffer->frame_count(), 0, 0, output.get());
+void AudioDecoderTest::OnDecoderOutput(
+    const scoped_refptr<AudioBuffer>& buffer) {
+  EXPECT_FALSE(buffer->end_of_stream());
+  decoded_audio_.push_back(buffer);
+}
 
-    // Generate a lossy hash of the audio used for comparison across platforms.
-    AudioHash audio_hash;
-    audio_hash.Update(output.get(), output->frames());
-    EXPECT_EQ(sample_info.hash, audio_hash.ToString());
+void AudioDecoderTest::DecodeFinished(AudioDecoder::Status status) {
+  EXPECT_TRUE(pending_decode_);
+  EXPECT_FALSE(pending_reset_);
+  pending_decode_ = false;
+  last_decode_status_ = status;
+}
 
-    if (!exact_hash.empty()) {
-      EXPECT_EQ(exact_hash, GetDecodedAudioMD5(i));
+void AudioDecoderTest::ResetFinished() {
+  EXPECT_TRUE(pending_reset_);
+  EXPECT_FALSE(pending_decode_);
+  pending_reset_ = false;
+}
 
-      // Verify different hashes are being generated.  None of our test data
-      // files have audio that hashes out exactly the same.
-      if (i > 0)
-        EXPECT_NE(exact_hash, GetDecodedAudioMD5(i - 1));
-    }
+// Generates an MD5 hash of the audio signal.  Should not be used for checks
+// across platforms as audio varies slightly across platforms.
+std::string AudioDecoderTest::GetDecodedAudioMD5(size_t i) {
+  CHECK_LT(i, decoded_audio_.size());
+  const scoped_refptr<AudioBuffer>& buffer = decoded_audio_[i];
+
+  scoped_ptr<AudioBus> output =
+      AudioBus::Create(buffer->channel_count(), buffer->frame_count());
+  buffer->ReadFrames(buffer->frame_count(), 0, 0, output.get());
+
+  base::MD5Context context;
+  base::MD5Init(&context);
+  for (int ch = 0; ch < output->channels(); ++ch) {
+    base::MD5Update(
+        &context,
+        base::StringPiece(reinterpret_cast<char*>(output->channel(ch)),
+                          output->frames() * sizeof(*output->channel(ch))));
   }
+  base::MD5Digest digest;
+  base::MD5Final(&digest, &context);
+  return base::MD5DigestToBase16(digest);
+}
 
-  size_t decoded_audio_size() const { return decoded_audio_.size(); }
-  base::TimeDelta start_timestamp() const { return start_timestamp_; }
-  const scoped_refptr<AudioBuffer>& decoded_audio(size_t i) {
-    return decoded_audio_[i];
-  }
-  AudioDecoder::Status last_decode_status() const {
-    return last_decode_status_;
+void AudioDecoderTest::ExpectDecodedAudio(size_t i,
+                                          const std::string& exact_hash) {
+  CHECK_LT(i, decoded_audio_.size());
+  const scoped_refptr<AudioBuffer>& buffer = decoded_audio_[i];
+
+  const DecodedBufferExpectations& sample_info = GetParam().expectations[i];
+  EXPECT_EQ(sample_info.timestamp, buffer->timestamp().InMicroseconds());
+  EXPECT_EQ(sample_info.duration, buffer->duration().InMicroseconds());
+  EXPECT_FALSE(buffer->end_of_stream());
+
+  scoped_ptr<AudioBus> output =
+      AudioBus::Create(buffer->channel_count(), buffer->frame_count());
+  buffer->ReadFrames(buffer->frame_count(), 0, 0, output.get());
+
+  // Generate a lossy hash of the audio used for comparison across platforms.
+  AudioHash audio_hash;
+  audio_hash.Update(output.get(), output->frames());
+  EXPECT_TRUE(audio_hash.IsEquivalent(sample_info.hash, 0.02))
+      << "Audio hashes differ. Expected: " << sample_info.hash
+      << " Actual: " << audio_hash.ToString();
+
+  if (!exact_hash.empty()) {
+    EXPECT_EQ(exact_hash, GetDecodedAudioMD5(i));
+
+    // Verify different hashes are being generated.  None of our test data
+    // files have audio that hashes out exactly the same.
+    if (i > 0)
+      EXPECT_NE(exact_hash, GetDecodedAudioMD5(i - 1));
   }
+}
 
- private:
-  base::MessageLoop message_loop_;
-  scoped_refptr<DecoderBuffer> data_;
-  scoped_ptr<InMemoryUrlProtocol> protocol_;
-  scoped_ptr<AudioFileReader> reader_;
-
-  scoped_ptr<AudioDecoder> decoder_;
-  bool pending_decode_;
-  bool pending_reset_;
-  AudioDecoder::Status last_decode_status_;
-
-  std::deque<scoped_refptr<AudioBuffer> > decoded_audio_;
-  base::TimeDelta start_timestamp_;
-
-  DISALLOW_COPY_AND_ASSIGN(AudioDecoderTest);
-};
-
-class OpusAudioDecoderBehavioralTest : public AudioDecoderTest {};
-class FFmpegAudioDecoderBehavioralTest : public AudioDecoderTest {};
+// Test definitions.
 
 TEST_P(AudioDecoderTest, Initialize) {
   ASSERT_NO_FATAL_FAILURE(Initialize());
@@ -378,160 +321,4 @@ TEST_P(AudioDecoderTest, NoTimestamp) {
   EXPECT_EQ(AudioDecoder::kDecodeError, last_decode_status());
 }
 
-TEST_P(OpusAudioDecoderBehavioralTest, InitializeWithNoCodecDelay) {
-  ASSERT_EQ(GetParam().decoder_type, OPUS);
-  std::vector<uint8_t> extra_data(
-      kOpusExtraData,
-      kOpusExtraData + arraysize(kOpusExtraData));
-  AudioDecoderConfig decoder_config;
-  decoder_config.Initialize(kCodecOpus,
-                            kSampleFormatF32,
-                            CHANNEL_LAYOUT_STEREO,
-                            48000,
-                            extra_data,
-                            false,
-                            base::TimeDelta::FromMilliseconds(80),
-                            0);
-  InitializeDecoder(decoder_config);
-}
-
-TEST_P(OpusAudioDecoderBehavioralTest, InitializeWithBadCodecDelay) {
-  ASSERT_EQ(GetParam().decoder_type, OPUS);
-  std::vector<uint8_t> extra_data(
-      kOpusExtraData,
-      kOpusExtraData + arraysize(kOpusExtraData));
-  AudioDecoderConfig decoder_config;
-  decoder_config.Initialize(
-      kCodecOpus,
-      kSampleFormatF32,
-      CHANNEL_LAYOUT_STEREO,
-      48000,
-      extra_data,
-      false,
-      base::TimeDelta::FromMilliseconds(80),
-      // Use a different codec delay than in the extradata.
-      100);
-  InitializeDecoderWithResult(decoder_config, true);
-}
-
-#if defined(OPUS_FIXED_POINT)
-const DecodedBufferExpectations kSfxOpusExpectations[] = {
-    {0, 13500, "-2.70,-1.41,-0.78,-1.27,-2.56,-3.73,"},
-    {13500, 20000, "5.48,5.93,6.05,5.83,5.54,5.46,"},
-    {33500, 20000, "-3.44,-3.34,-3.57,-4.11,-4.74,-5.13,"},
-};
-#else
-const DecodedBufferExpectations kSfxOpusExpectations[] = {
-    {0, 13500, "-2.70,-1.41,-0.78,-1.27,-2.56,-3.73,"},
-    {13500, 20000, "5.48,5.93,6.04,5.83,5.54,5.45,"},
-    {33500, 20000, "-3.45,-3.35,-3.57,-4.12,-4.74,-5.14,"},
-};
-#endif
-
-const DecodedBufferExpectations kBearOpusExpectations[] = {
-    {500, 3500, "-0.26,0.87,1.36,0.84,-0.30,-1.22,"},
-    {4000, 10000, "0.09,0.23,0.21,0.03,-0.17,-0.24,"},
-    {14000, 10000, "0.10,0.24,0.23,0.04,-0.14,-0.23,"},
-};
-
-const DecoderTestData kOpusTests[] = {
-    {OPUS, kCodecOpus, "sfx-opus.ogg", kSfxOpusExpectations, -312, 48000,
-     CHANNEL_LAYOUT_MONO},
-    {OPUS, kCodecOpus, "bear-opus.ogg", kBearOpusExpectations, 24, 48000,
-     CHANNEL_LAYOUT_STEREO},
-};
-
-// Dummy data for behavioral tests.
-const DecoderTestData kOpusBehavioralTest[] = {
-    {OPUS, kUnknownAudioCodec, "", NULL, 0, 0, CHANNEL_LAYOUT_NONE},
-};
-
-INSTANTIATE_TEST_CASE_P(OpusAudioDecoderTest,
-                        AudioDecoderTest,
-                        testing::ValuesIn(kOpusTests));
-INSTANTIATE_TEST_CASE_P(OpusAudioDecoderBehavioralTest,
-                        OpusAudioDecoderBehavioralTest,
-                        testing::ValuesIn(kOpusBehavioralTest));
-
-#if defined(USE_PROPRIETARY_CODECS)
-const DecodedBufferExpectations kSfxMp3Expectations[] = {
-    {0, 1065, "2.81,3.99,4.53,4.10,3.08,2.46,"},
-    {1065, 26122, "-3.81,-4.14,-3.90,-3.36,-3.03,-3.23,"},
-    {27188, 26122, "4.24,3.95,4.22,4.78,5.13,4.93,"},
-};
-
-const DecodedBufferExpectations kSfxAdtsExpectations[] = {
-    {0, 23219, "-1.90,-1.53,-0.15,1.28,1.23,-0.33,"},
-    {23219, 23219, "0.54,0.88,2.19,3.54,3.24,1.63,"},
-    {46439, 23219, "1.42,1.69,2.95,4.23,4.02,2.36,"},
-};
-#endif
-
-#if defined(OS_CHROMEOS)
-const DecodedBufferExpectations kSfxFlacExpectations[] = {
-    {0, 104489, "-2.42,-1.12,0.71,1.70,1.09,-0.68,"},
-    {104489, 104489, "-1.99,-0.67,1.18,2.19,1.60,-0.16,"},
-    {208979, 79433, "2.84,2.70,3.23,4.06,4.59,4.44,"},
-};
-#endif
-
-const DecodedBufferExpectations kSfxWaveExpectations[] = {
-    {0, 23219, "-1.23,-0.87,0.47,1.85,1.88,0.29,"},
-    {23219, 23219, "0.75,1.10,2.43,3.78,3.53,1.93,"},
-    {46439, 23219, "1.27,1.56,2.83,4.13,3.87,2.23,"},
-};
-
-const DecodedBufferExpectations kFourChannelWaveExpectations[] = {
-    {0, 11609, "-1.68,1.68,0.89,-3.45,1.52,1.15,"},
-    {11609, 11609, "43.26,9.06,18.27,35.98,19.45,7.46,"},
-    {23219, 11609, "36.37,9.45,16.04,27.67,18.81,10.15,"},
-};
-
-const DecodedBufferExpectations kSfxOggExpectations[] = {
-    {0, 13061, "-0.33,1.25,2.86,3.26,2.09,0.14,"},
-    {13061, 23219, "-2.79,-2.42,-1.06,0.33,0.93,-0.64,"},
-    {36281, 23219, "-1.19,-0.80,0.57,1.97,2.08,0.51,"},
-};
-
-const DecodedBufferExpectations kBearOgvExpectations[] = {
-    {0, 13061, "-1.25,0.10,2.11,2.29,1.50,-0.68,"},
-    {13061, 23219, "-1.80,-1.41,-0.13,1.30,1.65,0.01,"},
-    {36281, 23219, "-1.43,-1.25,0.11,1.29,1.86,0.14,"},
-};
-
-const DecoderTestData kFFmpegTests[] = {
-#if defined(USE_PROPRIETARY_CODECS)
-    {FFMPEG, kCodecMP3, "sfx.mp3", kSfxMp3Expectations, 0, 44100,
-     CHANNEL_LAYOUT_MONO},
-    {FFMPEG, kCodecAAC, "sfx.adts", kSfxAdtsExpectations, 0, 44100,
-     CHANNEL_LAYOUT_MONO},
-#endif
-#if defined(OS_CHROMEOS)
-    {FFMPEG, kCodecFLAC, "sfx.flac", kSfxFlacExpectations, 0, 44100,
-     CHANNEL_LAYOUT_MONO},
-#endif
-    {FFMPEG, kCodecPCM, "sfx_f32le.wav", kSfxWaveExpectations, 0, 44100,
-     CHANNEL_LAYOUT_MONO},
-    {FFMPEG, kCodecPCM, "4ch.wav", kFourChannelWaveExpectations, 0, 44100,
-     CHANNEL_LAYOUT_QUAD},
-    {FFMPEG, kCodecVorbis, "sfx.ogg", kSfxOggExpectations, 0, 44100,
-     CHANNEL_LAYOUT_MONO},
-    // Note: bear.ogv is incorrectly muxed such that valid samples are given
-    // negative timestamps, this marks them for discard per the ogg vorbis spec.
-    {FFMPEG, kCodecVorbis, "bear.ogv", kBearOgvExpectations, -704, 44100,
-     CHANNEL_LAYOUT_STEREO},
-};
-
-// Dummy data for behavioral tests.
-const DecoderTestData kFFmpegBehavioralTest[] = {
-    {FFMPEG, kUnknownAudioCodec, "", NULL, 0, 0, CHANNEL_LAYOUT_NONE},
-};
-
-INSTANTIATE_TEST_CASE_P(FFmpegAudioDecoderTest,
-                        AudioDecoderTest,
-                        testing::ValuesIn(kFFmpegTests));
-INSTANTIATE_TEST_CASE_P(FFmpegAudioDecoderBehavioralTest,
-                        FFmpegAudioDecoderBehavioralTest,
-                        testing::ValuesIn(kFFmpegBehavioralTest));
-
 }  // namespace media