Miscellaneous header file cleanup for src/media.

Review URL: http://codereview.chromium.org/8418017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107772 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 11 insertions, 23 deletions

diff --git a/media/ffmpeg/ffmpeg_common.cc b/media/ffmpeg/ffmpeg_common.cc
index 1b8a81c..cbcb7c6 100644
--- a/media/ffmpeg/ffmpeg_common.cc
+++ b/media/ffmpeg/ffmpeg_common.cc
@@ -5,6 +5,8 @@
 #include "media/ffmpeg/ffmpeg_common.h"
 
 #include "base/logging.h"
+#include "media/base/audio_decoder_config.h"
+#include "media/base/video_decoder_config.h"
 
 namespace media {
 
diff --git a/media/ffmpeg/ffmpeg_common.h b/media/ffmpeg/ffmpeg_common.h
index bb01f4f..13a53cf 100644
--- a/media/ffmpeg/ffmpeg_common.h
+++ b/media/ffmpeg/ffmpeg_common.h
@@ -9,13 +9,10 @@
 #include <cerrno>
 
 #include "base/compiler_specific.h"
-#include "base/memory/singleton.h"
 #include "base/time.h"
-#include "media/base/audio_decoder_config.h"
 #include "media/base/channel_layout.h"
 #include "media/base/media_export.h"
-#include "media/video/video_decode_engine.h"
-#include "ui/gfx/size.h"
+#include "media/base/video_frame.h"
 
 // Include FFmpeg header files.
 extern "C" {
@@ -32,6 +29,9 @@ MSVC_POP_WARNING();
 
 namespace media {
 
+class AudioDecoderConfig;
+class VideoDecoderConfig;
+
 // Wraps FFmpeg's av_free() in a class that can be passed as a template argument
 // to scoped_ptr_malloc.
 class ScopedPtrAVFree {
diff --git a/media/filters/chunk_demuxer.cc b/media/filters/chunk_demuxer.cc
index 383b9e3..33da332 100644
--- a/media/filters/chunk_demuxer.cc
+++ b/media/filters/chunk_demuxer.cc
@@ -11,8 +11,10 @@
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
+#include "media/base/audio_decoder_config.h"
 #include "media/base/filter_host.h"
 #include "media/base/data_buffer.h"
+#include "media/base/video_decoder_config.h"
 #include "media/ffmpeg/ffmpeg_common.h"
 #include "media/filters/chunk_demuxer_client.h"
 #include "media/filters/ffmpeg_glue.h"
diff --git a/media/filters/ffmpeg_audio_decoder.cc b/media/filters/ffmpeg_audio_decoder.cc
index dca4bfa..f2ac089 100644
--- a/media/filters/ffmpeg_audio_decoder.cc
+++ b/media/filters/ffmpeg_audio_decoder.cc
@@ -5,6 +5,7 @@
 #include "media/filters/ffmpeg_audio_decoder.h"
 
 #include "base/bind.h"
+#include "media/base/audio_decoder_config.h"
 #include "media/base/data_buffer.h"
 #include "media/base/demuxer.h"
 #include "media/base/filter_host.h"
diff --git a/media/filters/ffmpeg_video_decoder.cc b/media/filters/ffmpeg_video_decoder.cc
index 998eea9..cc8f926 100644
--- a/media/filters/ffmpeg_video_decoder.cc
+++ b/media/filters/ffmpeg_video_decoder.cc
@@ -4,21 +4,17 @@
 
 #include "media/filters/ffmpeg_video_decoder.h"
 
-#include <deque>
-
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/message_loop.h"
 #include "base/task.h"
 #include "media/base/demuxer_stream.h"
-#include "media/base/filters.h"
 #include "media/base/filter_host.h"
 #include "media/base/limits.h"
 #include "media/base/video_frame.h"
 #include "media/ffmpeg/ffmpeg_common.h"
 #include "media/video/ffmpeg_video_decode_engine.h"
 #include "media/video/video_decode_context.h"
-#include "ui/gfx/rect.h"
 
 namespace media {
 
diff --git a/media/filters/ffmpeg_video_decoder.h b/media/filters/ffmpeg_video_decoder.h
index cd00bd3..b22144e 100644
--- a/media/filters/ffmpeg_video_decoder.h
+++ b/media/filters/ffmpeg_video_decoder.h
@@ -7,12 +7,10 @@
 
 #include <deque>
 
-#include "base/gtest_prod_util.h"
-#include "base/time.h"
 #include "media/base/filters.h"
 #include "media/base/pts_stream.h"
-#include "media/base/video_frame.h"
 #include "media/video/video_decode_engine.h"
+#include "ui/gfx/size.h"
 
 namespace media {
 
@@ -52,17 +50,6 @@ class MEDIA_EXPORT FFmpegVideoDecoder
       scoped_refptr<VideoFrame> frame,
       const PipelineStatistics& statistics) OVERRIDE;
 
-  friend class DecoderPrivateMock;
-  friend class FFmpegVideoDecoderTest;
-  FRIEND_TEST_ALL_PREFIXES(FFmpegVideoDecoderTest, PtsStream);
-  FRIEND_TEST_ALL_PREFIXES(FFmpegVideoDecoderTest,
-                           DoDecode_EnqueueVideoFrameError);
-  FRIEND_TEST_ALL_PREFIXES(FFmpegVideoDecoderTest,
-                           DoDecode_FinishEnqueuesEmptyFrames);
-  FRIEND_TEST_ALL_PREFIXES(FFmpegVideoDecoderTest,
-                           DoDecode_TestStateTransition);
-  FRIEND_TEST_ALL_PREFIXES(FFmpegVideoDecoderTest, DoSeek);
-
   enum DecoderState {
     kUnInitialized,
     kInitializing,
diff --git a/media/test/ffmpeg_tests/ffmpeg_tests.cc b/media/test/ffmpeg_tests/ffmpeg_tests.cc
index e91ca00..2cc8cc88 100644
--- a/media/test/ffmpeg_tests/ffmpeg_tests.cc
+++ b/media/test/ffmpeg_tests/ffmpeg_tests.cc
@@ -10,6 +10,7 @@
 #include <iostream>
 #include <string>
 
+#include "base/at_exit.h"
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
diff --git a/media/video/video_decode_engine.h b/media/video/video_decode_engine.h
index cd1f986..c2b1bfa 100644
--- a/media/video/video_decode_engine.h
+++ b/media/video/video_decode_engine.h
@@ -10,7 +10,6 @@
 #include "media/base/media_export.h"
 #include "media/base/video_decoder_config.h"
 #include "media/base/video_frame.h"
-#include "ui/gfx/size.h"
 
 class MessageLoop;