Replace all use of cricket::VideoFrame and cricket::WebRtcVideoFrame with webrtc::VideoFrame.

These classes are deprecated in webrtc.

BUG=webrtc:5682

Review-Url: https://codereview.chromium.org/2466353003
Cr-Commit-Position: refs/heads/master@{#430257}

content/renderer/media/webrtc/media_stream_remote_video_source.cc

@@ -16,7 +16,6 @@
 #include "media/base/timestamp_constants.h"
 #include "media/base/video_frame.h"
 #include "media/base/video_util.h"
-#include "third_party/webrtc/media/base/videoframe.h"
 #include "third_party/webrtc/media/base/videosinkinterface.h"
 
 namespace content {
@@ -44,7 +43,7 @@ media::VideoRotation WebRTCToMediaVideoRotation(
 // libjingle thread and forward it to the IO-thread.
 class MediaStreamRemoteVideoSource::RemoteVideoSourceDelegate
     : public base::RefCountedThreadSafe<RemoteVideoSourceDelegate>,
-      public rtc::VideoSinkInterface<cricket::VideoFrame> {
+      public rtc::VideoSinkInterface<webrtc::VideoFrame> {
  public:
   RemoteVideoSourceDelegate(
       scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
@@ -57,7 +56,7 @@ class MediaStreamRemoteVideoSource::RemoteVideoSourceDelegate
   // Implements rtc::VideoSinkInterface used for receiving video frames
   // from the PeerConnection video track. May be called on a libjingle internal
   // thread.
-  void OnFrame(const cricket::VideoFrame& frame) override;
+  void OnFrame(const webrtc::VideoFrame& frame) override;
 
   void DoRenderFrameOnIOThread(
       const scoped_refptr<media::VideoFrame>& video_frame);
@@ -96,7 +95,7 @@ void DoNothing(const scoped_refptr<rtc::RefCountInterface>& ref) {}
 }  // anonymous
 
 void MediaStreamRemoteVideoSource::RemoteVideoSourceDelegate::OnFrame(
-    const cricket::VideoFrame& incoming_frame) {
+    const webrtc::VideoFrame& incoming_frame) {
   const base::TimeDelta incoming_timestamp = base::TimeDelta::FromMicroseconds(
       incoming_frame.timestamp_us());
   const base::TimeTicks render_time =
@@ -226,7 +225,7 @@ void MediaStreamRemoteVideoSource::StopSourceImpl() {
   observer_.reset();
 }
 
-rtc::VideoSinkInterface<cricket::VideoFrame>*
+rtc::VideoSinkInterface<webrtc::VideoFrame>*
 MediaStreamRemoteVideoSource::SinkInterfaceForTest() {
   return delegate_.get();
 }

content/renderer/media/webrtc/media_stream_remote_video_source.h

@@ -49,7 +49,7 @@ class CONTENT_EXPORT MediaStreamRemoteVideoSource
 
   // Used by tests to test that a frame can be received and that the
   // MediaStreamRemoteVideoSource behaves as expected.
-  rtc::VideoSinkInterface<cricket::VideoFrame>* SinkInterfaceForTest();
+  rtc::VideoSinkInterface<webrtc::VideoFrame>* SinkInterfaceForTest();
 
  private:
   void OnChanged(webrtc::MediaStreamTrackInterface::TrackState state);

content/renderer/media/webrtc/media_stream_remote_video_source_unittest.cc

@@ -18,7 +18,6 @@
 #include "media/base/video_frame.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/public/web/WebHeap.h"
-#include "third_party/webrtc/media/engine/webrtcvideoframe.h"
 
 namespace content {
 
@@ -132,7 +131,7 @@ TEST_F(MediaStreamRemoteVideoSourceTest, StartTrack) {
   buffer->SetToBlack();
 
   source()->SinkInterfaceForTest()->OnFrame(
-      cricket::WebRtcVideoFrame(buffer, webrtc::kVideoRotation_0, 1000));
+      webrtc::VideoFrame(buffer, webrtc::kVideoRotation_0, 1000));
   run_loop.Run();
 
   EXPECT_EQ(1, sink.number_of_frames());

content/renderer/media/webrtc/media_stream_track_metrics_unittest.cc

@@ -64,9 +64,9 @@ class MockVideoTrackInterface : public VideoTrackInterface {
   MOCK_METHOD1(set_enabled, bool(bool));
   MOCK_METHOD1(set_state, bool(TrackState));
   MOCK_METHOD2(AddOrUpdateSink,
-               void(rtc::VideoSinkInterface<cricket::VideoFrame>*,
+               void(rtc::VideoSinkInterface<webrtc::VideoFrame>*,
                     const rtc::VideoSinkWants&));
-  MOCK_METHOD1(RemoveSink, void(rtc::VideoSinkInterface<cricket::VideoFrame>*));
+  MOCK_METHOD1(RemoveSink, void(rtc::VideoSinkInterface<webrtc::VideoFrame>*));
   MOCK_CONST_METHOD0(GetSource, VideoTrackSourceInterface*());
 
  private:

content/renderer/media/webrtc/mock_peer_connection_dependency_factory.cc

@@ -191,14 +191,14 @@ scoped_refptr<MockWebRtcVideoTrack> MockWebRtcVideoTrack::Create(
 }
 
 void MockWebRtcVideoTrack::AddOrUpdateSink(
-    rtc::VideoSinkInterface<cricket::VideoFrame>* sink,
+    rtc::VideoSinkInterface<webrtc::VideoFrame>* sink,
     const rtc::VideoSinkWants& wants) {
   DCHECK(!sink_);
   sink_ = sink;
 }
 
 void MockWebRtcVideoTrack::RemoveSink(
-    rtc::VideoSinkInterface<cricket::VideoFrame>* sink) {
+    rtc::VideoSinkInterface<webrtc::VideoFrame>* sink) {
   DCHECK(sink_ == sink);
   sink_ = NULL;
 }

content/renderer/media/webrtc/mock_peer_connection_dependency_factory.h

@@ -55,9 +55,9 @@ class MockWebRtcVideoTrack : public webrtc::VideoTrackInterface {
   static scoped_refptr<MockWebRtcVideoTrack> Create(const std::string& id);
   MockWebRtcVideoTrack(const std::string& id,
                        webrtc::VideoTrackSourceInterface* source);
-  void AddOrUpdateSink(rtc::VideoSinkInterface<cricket::VideoFrame>* sink,
+  void AddOrUpdateSink(rtc::VideoSinkInterface<webrtc::VideoFrame>* sink,
                        const rtc::VideoSinkWants& wants) override;
-  void RemoveSink(rtc::VideoSinkInterface<cricket::VideoFrame>* sink) override;
+  void RemoveSink(rtc::VideoSinkInterface<webrtc::VideoFrame>* sink) override;
   webrtc::VideoTrackSourceInterface* GetSource() const override;
 
   std::string kind() const override;
@@ -80,7 +80,7 @@ class MockWebRtcVideoTrack : public webrtc::VideoTrackInterface {
   bool enabled_;
   TrackState state_;
   ObserverSet observers_;
-  rtc::VideoSinkInterface<cricket::VideoFrame>* sink_;
+  rtc::VideoSinkInterface<webrtc::VideoFrame>* sink_;
 };
 
 class MockMediaStream : public webrtc::MediaStreamInterface {

content/renderer/media/webrtc/webrtc_video_capturer_adapter.cc

@@ -20,9 +20,7 @@
 #include "third_party/libyuv/include/libyuv/convert_from.h"
 #include "third_party/libyuv/include/libyuv/scale.h"
 #include "third_party/skia/include/core/SkSurface.h"
-#include "third_party/webrtc/common_video/include/video_frame_buffer.h"
 #include "third_party/webrtc/common_video/rotation.h"
-#include "third_party/webrtc/media/engine/webrtcvideoframe.h"
 
 namespace content {
 
@@ -201,7 +199,7 @@ void WebRtcVideoCapturerAdapter::OnFrameCaptured(
   // Return |frame| directly if it is texture backed, because there is no
   // cropping support for texture yet. See http://crbug/503653.
   if (frame->HasTextures()) {
-    OnFrame(cricket::WebRtcVideoFrame(
+    OnFrame(webrtc::VideoFrame(
                 new rtc::RefCountedObject<WebRtcVideoFrameAdapter>(
                     frame, base::Bind(&TextureFrameCopier::CopyTextureFrame,
                                       texture_copier_)),
@@ -230,7 +228,7 @@ void WebRtcVideoCapturerAdapter::OnFrameCaptured(
 
   // If no scaling is needed, return a wrapped version of |frame| directly.
   if (video_frame->natural_size() == video_frame->visible_rect().size()) {
-    OnFrame(cricket::WebRtcVideoFrame(
+    OnFrame(webrtc::VideoFrame(
                 new rtc::RefCountedObject<WebRtcVideoFrameAdapter>(
                     video_frame,
                     WebRtcVideoFrameAdapter::CopyTextureFrameCallback()),
@@ -260,7 +258,7 @@ void WebRtcVideoCapturerAdapter::OnFrameCaptured(
                     scaled_frame->stride(media::VideoFrame::kVPlane),
                     adapted_width, adapted_height, libyuv::kFilterBilinear);
 
-  OnFrame(cricket::WebRtcVideoFrame(
+  OnFrame(webrtc::VideoFrame(
               new rtc::RefCountedObject<WebRtcVideoFrameAdapter>(
                   scaled_frame,
                   WebRtcVideoFrameAdapter::CopyTextureFrameCallback()),

content/renderer/media/webrtc/webrtc_video_capturer_adapter_unittest.cc

@@ -19,7 +19,7 @@ static void ReleaseMailboxCB(const gpu::SyncToken& sync_token) {}
 namespace content {
 
 class WebRtcVideoCapturerAdapterTest
-    : public rtc::VideoSinkInterface<cricket::VideoFrame>,
+    : public rtc::VideoSinkInterface<webrtc::VideoFrame>,
       public ::testing::Test {
  public:
   WebRtcVideoCapturerAdapterTest()
@@ -77,7 +77,7 @@ class WebRtcVideoCapturerAdapterTest
   }
 
   // rtc::VideoSinkInterface
-  void OnFrame(const cricket::VideoFrame& frame) override {
+  void OnFrame(const webrtc::VideoFrame& frame) override {
     output_frame_ = frame;
     output_frame_width_ = frame.width();
     output_frame_height_ = frame.height();
@@ -88,7 +88,8 @@ class WebRtcVideoCapturerAdapterTest
   const ChildProcess child_process_;
 
   WebRtcVideoCapturerAdapter adapter_;
-  cricket::VideoFrame output_frame_;
+  // TODO(nisse): Default constructor is deprecated. Use std::optional?
+  webrtc::VideoFrame output_frame_;
   int output_frame_width_;
   int output_frame_height_;
 };

remoting/protocol/webrtc_video_renderer_adapter.cc

@@ -22,7 +22,6 @@
 #include "remoting/protocol/video_renderer.h"
 #include "remoting/protocol/webrtc_transport.h"
 #include "third_party/libyuv/include/libyuv/convert_from.h"
-#include "third_party/webrtc/media/base/videoframe.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_frame.h"
 
 namespace remoting {
@@ -96,7 +95,7 @@ void WebrtcVideoRendererAdapter::SetVideoStatsChannel(
   video_stats_dispatcher_->Init(std::move(message_pipe), this);
 }
 
-void WebrtcVideoRendererAdapter::OnFrame(const cricket::VideoFrame& frame) {
+void WebrtcVideoRendererAdapter::OnFrame(const webrtc::VideoFrame& frame) {
   if (static_cast<uint64_t>(frame.timestamp_us()) >= rtc::TimeMicros()) {
     // The host sets playout delay to 0, so all incoming frames are expected to
     // be rendered as so as they are received.

remoting/protocol/webrtc_video_renderer_adapter.h

@@ -35,7 +35,7 @@ struct ClientFrameStats;
 struct HostFrameStats;
 
 class WebrtcVideoRendererAdapter
-    : public rtc::VideoSinkInterface<cricket::VideoFrame>,
+    : public rtc::VideoSinkInterface<webrtc::VideoFrame>,
       public VideoStatsStub,
       public ClientVideoStatsDispatcher::EventHandler {
  public:
@@ -49,7 +49,7 @@ class WebrtcVideoRendererAdapter
   void SetVideoStatsChannel(std::unique_ptr<MessagePipe> message_pipe);
 
   // rtc::VideoSinkInterface implementation.
-  void OnFrame(const cricket::VideoFrame& frame) override;
+  void OnFrame(const webrtc::VideoFrame& frame) override;
 
  private:
   // VideoStatsStub interface.