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

content/renderer/media/webrtc/webrtc_video_capturer_adapter_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/run_loop.h"
 #include "content/child/child_process.h"
 #include "content/renderer/media/webrtc/webrtc_video_capturer_adapter.h"
 #include "gpu/command_buffer/common/mailbox_holder.h"
 #include "media/base/video_frame.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 static void ReleaseMailboxCB(const gpu::SyncToken& sync_token) {}
 }  // anonymous namespace
 
 namespace content {
 
 class WebRtcVideoCapturerAdapterTest
-    : public rtc::VideoSinkInterface<cricket::VideoFrame>,
+    : public rtc::VideoSinkInterface<webrtc::VideoFrame>,
       public ::testing::Test {
  public:
   WebRtcVideoCapturerAdapterTest()
       : adapter_(false),
         output_frame_width_(0),
         output_frame_height_(0) {
     adapter_.AddOrUpdateSink(this, rtc::VideoSinkWants());
   }
   ~WebRtcVideoCapturerAdapterTest() override {
     adapter_.RemoveSink(this);
@@ skipping 37 matching lines @@
 
     rtc::scoped_refptr<webrtc::VideoFrameBuffer> copied_frame =
         texture_frame->NativeToI420Buffer();
     EXPECT_TRUE(copied_frame);
     EXPECT_TRUE(copied_frame->DataY());
     EXPECT_TRUE(copied_frame->DataU());
     EXPECT_TRUE(copied_frame->DataV());
   }
 
   // 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();
   }
 
  private:
   const base::MessageLoopForIO message_loop_;
   const ChildProcess child_process_;
 
   WebRtcVideoCapturerAdapter adapter_;
-  cricket::VideoFrame output_frame_;
+  // TODO(nisse): Default constructor is deprecated. Use std::optional?

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

std::optional is C++17. But this code could use base::Optional<> or allocate
output_frame_ dynamically (i.e. std::unique_ptr<>)

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

I figured there's something similar to std::Optional in Chrome. Webrtc also has
it's own rtc::Optional.

+  webrtc::VideoFrame output_frame_;
   int output_frame_width_;
   int output_frame_height_;
 };
 
 TEST_F(WebRtcVideoCapturerAdapterTest, CropFrameTo640360) {
   TestSourceCropFrame(640, 480, 640, 360, 640, 360);
 }
 
 TEST_F(WebRtcVideoCapturerAdapterTest, CropFrameTo320320) {
   TestSourceCropFrame(640, 480, 480, 480, 320, 320);
 }
 
 TEST_F(WebRtcVideoCapturerAdapterTest, Scale720To640360) {
   TestSourceCropFrame(1280, 720, 1280, 720, 640, 360);
 }
 
 TEST_F(WebRtcVideoCapturerAdapterTest, SendsWithCopyTextureFrameCallback) {
   TestSourceTextureFrame();
 }
 
 }  // namespace content