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

webrtc/media/base/testutils.cc

 /*
  *  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.
  */
 
 #include "webrtc/media/base/testutils.h"
 
 #include <math.h>
 #include <algorithm>
 #include <memory>
 
 #include "webrtc/base/bytebuffer.h"
 #include "webrtc/base/fileutils.h"
 #include "webrtc/base/gunit.h"
 #include "webrtc/base/pathutils.h"
 #include "webrtc/base/stream.h"
 #include "webrtc/base/stringutils.h"
 #include "webrtc/base/testutils.h"
 #include "webrtc/media/base/rtpdump.h"
 #include "webrtc/media/base/videocapturer.h"
-#include "webrtc/media/base/videoframe.h"
+#include "webrtc/video_frame.h"
 
 namespace cricket {
 
 /////////////////////////////////////////////////////////////////////////
 // Implementation of RawRtpPacket
 /////////////////////////////////////////////////////////////////////////
 void RawRtpPacket::WriteToByteBuffer(uint32_t in_ssrc,
                                      rtc::ByteBufferWriter* buf) const {
   if (!buf) return;
 
@@ skipping 186 matching lines @@
 
 VideoCapturerListener::~VideoCapturerListener() {
   capturer_->RemoveSink(this);
 }
 
 void VideoCapturerListener::OnStateChange(VideoCapturer* capturer,
                                           CaptureState result) {
   last_capture_state_ = result;
 }
 
-void VideoCapturerListener::OnFrame(const VideoFrame& frame) {
+void VideoCapturerListener::OnFrame(const webrtc::VideoFrame& frame) {
   ++frame_count_;
   if (1 == frame_count_) {
     frame_width_ = frame.width();
     frame_height_ = frame.height();
   } else if (frame_width_ != frame.width() || frame_height_ != frame.height()) {
     resolution_changed_ = true;
   }
 }
 
 cricket::StreamParams CreateSimStreamParams(
@@ skipping 18 matching lines @@
     std::vector<uint32_t> fid_ssrcs;
     fid_ssrcs.push_back(ssrcs[i]);
     fid_ssrcs.push_back(rtx_ssrcs[i]);
     cricket::SsrcGroup fid_group(cricket::kFidSsrcGroupSemantics, fid_ssrcs);
     sp.ssrc_groups.push_back(fid_group);
   }
   return sp;
 }
 
 }  // namespace cricket