Revert 96974 - Remove mock_ffmpeg and update media unittests.

media/filters/bitstream_converter.h

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
 // Interface and some concrete classes for applying various transforms
 // to AVPackets.  FFmpegBitstreamConverter, in particular, can be used
 // to apply FFmpeg bitstream filters to the incoming AVPacket to transcode
 // the packet format.
 
 #ifndef MEDIA_FILTERS_BITSTREAM_CONVERTER_H_
 #define MEDIA_FILTERS_BITSTREAM_CONVERTER_H_
@@ skipping 50 matching lines @@
   // AVCodecContext for the stream sourcing these packets. A reference to
   // |stream_context| is retained, so it must outlive this class.
   FFmpegBitstreamConverter(const std::string& filter_name,
                            AVCodecContext* stream_context);
   virtual ~FFmpegBitstreamConverter();
 
   virtual bool Initialize();
   virtual bool ConvertPacket(AVPacket* packet);
 
  private:
+  FRIEND_TEST_ALL_PREFIXES(BitstreamConverterTest, ConvertPacket_FailedFilter);
+  FRIEND_TEST_ALL_PREFIXES(BitstreamConverterTest, ConvertPacket_Success);
+  FRIEND_TEST_ALL_PREFIXES(BitstreamConverterTest,
+                           ConvertPacket_SuccessInPlace);
+
   std::string filter_name_;
   AVBitStreamFilterContext* stream_filter_;
   AVCodecContext* stream_context_;
 
   DISALLOW_COPY_AND_ASSIGN(FFmpegBitstreamConverter);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_BITSTREAM_CONVERTER_H_