Avoid using the VideoFrame default constructor.

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"
@@ skipping 44 matching lines @@
   void TestSourceTextureFrame() {
     EXPECT_TRUE(message_loop_.IsCurrent());
     gpu::MailboxHolder holders[media::VideoFrame::kMaxPlanes] = {
         gpu::MailboxHolder(gpu::Mailbox::Generate(), gpu::SyncToken(), 5)};
     scoped_refptr<media::VideoFrame> frame =
         media::VideoFrame::WrapNativeTextures(
             media::PIXEL_FORMAT_ARGB, holders, base::Bind(&ReleaseMailboxCB),
             gfx::Size(10, 10), gfx::Rect(10, 10), gfx::Size(10, 10),
             base::TimeDelta());
     adapter_.OnFrameCaptured(frame);
+    ASSERT_TRUE(output_frame_);
     rtc::scoped_refptr<webrtc::VideoFrameBuffer> texture_frame =
-        output_frame_.video_frame_buffer();
+        output_frame_->video_frame_buffer();
     EXPECT_EQ(media::VideoFrame::STORAGE_OPAQUE,
               static_cast<media::VideoFrame*>(texture_frame->native_handle())
                   ->storage_type());
 
     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 webrtc::VideoFrame& frame) override {
-    output_frame_ = frame;
+    output_frame_ = rtc::Optional<webrtc::VideoFrame>(frame);
     output_frame_width_ = frame.width();
     output_frame_height_ = frame.height();
   }
 
  private:
   const base::MessageLoopForIO message_loop_;
   const ChildProcess child_process_;
 
   WebRtcVideoCapturerAdapter adapter_;
-  // TODO(nisse): Default constructor is deprecated. Use std::optional?
-  webrtc::VideoFrame output_frame_;
+  rtc::Optional<webrtc::VideoFrame> output_frame_;

[Sergey Ulanov, 2016/12/02 18:24:05]

This this test is in chromium I think it's better to use base::Optional<> here.

[nisse-chromium (ooo August 14), 2016/12/05 09:54:35]

Done.

   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