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

webrtc/media/base/testutils.h

 /*
  *  Copyright (c) 2004 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 11 matching lines @@
 #include "webrtc/media/base/mediachannel.h"
 #include "webrtc/media/base/videocapturer.h"
 #include "webrtc/media/base/videocommon.h"
 
 namespace rtc {
 class ByteBufferReader;
 class ByteBufferWriter;
 class StreamInterface;
 }
 
-namespace webrtc {
-class VideoFrame;
-}
-
 namespace cricket {
 
 // Returns size of 420 image with rounding on chroma for odd sizes.
 #define I420_SIZE(w, h) (w * h + (((w + 1) / 2) * ((h + 1) / 2)) * 2)
 // Returns size of ARGB image.
 #define ARGB_SIZE(w, h) (w * h * 4)
 
 template <class T> inline std::vector<T> MakeVector(const T a[], size_t s) {
   return std::vector<T>(a, a + s);
 }
@@ skipping 66 matching lines @@
   static const RawRtpPacket kTestRawRtpPackets[];
   static const RawRtcpPacket kTestRawRtcpPackets[];
 
  private:
   RtpTestUtility() {}
 };
 
 // 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();
 
   CaptureState last_capture_state() const { return last_capture_state_; }
   int frame_count() const { return frame_count_; }
   int frame_width() const { return frame_width_; }
   int frame_height() const { return frame_height_; }
   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_;
   CaptureState last_capture_state_;
   int frame_count_;
   int frame_width_;
   int frame_height_;
   bool resolution_changed_;
 };
 
@@ skipping 43 matching lines @@
 // Create Simulcast stream with given |ssrcs| and |rtx_ssrcs|.
 // The number of |rtx_ssrcs| must match number of |ssrcs|.
 cricket::StreamParams CreateSimWithRtxStreamParams(
     const std::string& cname,
     const std::vector<uint32_t>& ssrcs,
     const std::vector<uint32_t>& rtx_ssrcs);
 
 }  // namespace cricket
 
 #endif  // WEBRTC_MEDIA_BASE_TESTUTILS_H_