Miscellaneous header file cleanup for src/media.

media/filters/ffmpeg_video_decoder.h

 // Copyright (c) 2011 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.
 
 #ifndef MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_
 #define MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_
 
 #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 {
 
 class VideoDecodeEngine;
 
 class MEDIA_EXPORT FFmpegVideoDecoder
     : public VideoDecoder,
       public VideoDecodeEngine::EventHandler {
  public:
   FFmpegVideoDecoder(MessageLoop* message_loop,
@@ skipping 19 matching lines @@
   virtual void OnInitializeComplete(bool success) OVERRIDE;
   virtual void OnUninitializeComplete() OVERRIDE;
   virtual void OnFlushComplete() OVERRIDE;
   virtual void OnSeekComplete() OVERRIDE;
   virtual void OnError() OVERRIDE;
   virtual void ProduceVideoSample(scoped_refptr<Buffer> buffer) OVERRIDE;
   virtual void ConsumeVideoFrame(
       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,
     kNormal,
     kFlushCodec,
     kDecodeFinished,
     kPausing,
     kFlushing,
     kStopped
   };
@@ skipping 35 matching lines @@
 
   // Pointer to the demuxer stream that will feed us compressed buffers.
   scoped_refptr<DemuxerStream> demuxer_stream_;
 
   DISALLOW_COPY_AND_ASSIGN(FFmpegVideoDecoder);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_