Miscellaneous header file cleanup for src/media.

media/filters/ffmpeg_video_decoder.h

Index: media/filters/ffmpeg_video_decoder.h
diff --git a/media/filters/ffmpeg_video_decoder.h b/media/filters/ffmpeg_video_decoder.h
index cd00bd31ece1c2cc70528655a28dc654e697d01c..b22144e10429c0035f80e4002902ee9c6a525653 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,