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

content/renderer/media/webrtc/webrtc_video_capturer_adapter.cc

Index: content/renderer/media/webrtc/webrtc_video_capturer_adapter.cc
diff --git a/content/renderer/media/webrtc/webrtc_video_capturer_adapter.cc b/content/renderer/media/webrtc/webrtc_video_capturer_adapter.cc
index c0d5c7c7b39556231179d31b4b0f24bba16e9591..c059a3b21a18cee9d4183e91af12225dddd7371f 100644
--- a/content/renderer/media/webrtc/webrtc_video_capturer_adapter.cc
+++ b/content/renderer/media/webrtc/webrtc_video_capturer_adapter.cc
@@ -20,9 +20,8 @@
 #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"
+// #include "third_party/webrtc/video_frame.h"

[Sergey Ulanov, 2016/11/02 19:33:59]

Why is this commented?

[nisse-chromium (ooo August 14), 2016/11/07 09:58:19]

Ooops, it's a left over. I'll delete this line.

 
 namespace content {
 
@@ -201,7 +200,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 +229,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 +259,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()),