Revert of Delete all use of cricket::VideoFrame and cricket::WebRtcVideoFrame.

webrtc/media/base/testutils.h

Index: webrtc/media/base/testutils.h
diff --git a/webrtc/media/base/testutils.h b/webrtc/media/base/testutils.h
index 01a2a4f9c175d1a3456b36696242ad4779a040ea..40034c0969a1709c1796dd41785544e288da1281 100644
--- a/webrtc/media/base/testutils.h
+++ b/webrtc/media/base/testutils.h
@@ -27,10 +27,6 @@
 class ByteBufferReader;
 class ByteBufferWriter;
 class StreamInterface;
-}
-
-namespace webrtc {
-class VideoFrame;
 }
 
 namespace cricket {
@@ -119,7 +115,7 @@
 // Test helper for testing VideoCapturer implementations.
 class VideoCapturerListener
     : public sigslot::has_slots<>,
-      public rtc::VideoSinkInterface<webrtc::VideoFrame> {
+      public rtc::VideoSinkInterface<cricket::VideoFrame> {
  public:
   explicit VideoCapturerListener(VideoCapturer* cap);
   ~VideoCapturerListener();
@@ -131,7 +127,7 @@
   bool resolution_changed() const { return resolution_changed_; }
 
   void OnStateChange(VideoCapturer* capturer, CaptureState state);
-  void OnFrame(const webrtc::VideoFrame& frame) override;
+  void OnFrame(const VideoFrame& frame) override;
 
  private:
   VideoCapturer* capturer_;