Reland of Delete method cricket::VideoFrame::Copy.

webrtc/media/engine/webrtcvideoframe_unittest.cc

 /*
  *  Copyright (c) 2011 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.
  */
 
@@ skipping 205 matching lines @@
 TEST_WEBRTCVIDEOFRAME(ConvertFromI400BufferInverted)
 TEST_WEBRTCVIDEOFRAME(ConvertFromYUY2Buffer)
 TEST_WEBRTCVIDEOFRAME(ConvertFromYUY2BufferStride)
 TEST_WEBRTCVIDEOFRAME(ConvertFromYUY2BufferInverted)
 TEST_WEBRTCVIDEOFRAME(ConvertFromUYVYBuffer)
 TEST_WEBRTCVIDEOFRAME(ConvertFromUYVYBufferStride)
 TEST_WEBRTCVIDEOFRAME(ConvertFromUYVYBufferInverted)
 // TEST_WEBRTCVIDEOFRAME(ConvertToI422Buffer)
 // TEST_WEBRTCVIDEOFRAME(ConstructARGBBlackWhitePixel)
 
-TEST_WEBRTCVIDEOFRAME(Copy)
-TEST_WEBRTCVIDEOFRAME(CopyIsRef)
-
 // These functions test implementation-specific details.
 // Tests the Init function with different cropped size.
 TEST_F(WebRtcVideoFrameTest, InitEvenSize) {
   TestInit(640, 360, webrtc::kVideoRotation_0, true);
 }
 
 TEST_F(WebRtcVideoFrameTest, InitOddWidth) {
   TestInit(601, 480, webrtc::kVideoRotation_0, true);
 }
 
@@ skipping 24 matching lines @@
   EXPECT_EQ(dummy_handle, frame.video_frame_buffer()->native_handle());
   EXPECT_EQ(640, frame.width());
   EXPECT_EQ(480, frame.height());
   EXPECT_EQ(20000, frame.GetTimeStamp());
   EXPECT_EQ(20, frame.timestamp_us());
   frame.set_timestamp_us(40);
   EXPECT_EQ(40000, frame.GetTimeStamp());
   EXPECT_EQ(40, frame.timestamp_us());
 }
 
-TEST_F(WebRtcVideoFrameTest, CopyTextureFrame) {
-  webrtc::test::FakeNativeHandle* dummy_handle =
-      new webrtc::test::FakeNativeHandle();
-  webrtc::NativeHandleBuffer* buffer =
-      new rtc::RefCountedObject<webrtc::test::FakeNativeHandleBuffer>(
-          dummy_handle, 640, 480);
-  // Timestamp is converted from ns to us, so last three digits are lost.
-  WebRtcVideoFrame frame1(buffer, 20000, webrtc::kVideoRotation_0);
-  VideoFrame* frame2 = frame1.Copy();
-  EXPECT_EQ(frame1.video_frame_buffer()->native_handle(),
-            frame2->video_frame_buffer()->native_handle());
-  EXPECT_EQ(frame1.width(), frame2->width());
-  EXPECT_EQ(frame1.height(), frame2->height());
-  EXPECT_EQ(frame1.GetTimeStamp(), frame2->GetTimeStamp());
-  EXPECT_EQ(frame1.timestamp_us(), frame2->timestamp_us());
-  delete frame2;
-}
-
 TEST_F(WebRtcVideoFrameTest, ApplyRotationToFrame) {
   WebRtcVideoFrame applied0;
   EXPECT_TRUE(IsNull(applied0));
   EXPECT_TRUE(LoadFrame(CreateYuvSample(kWidth, kHeight, 12).get(), FOURCC_I420,
                         kWidth, kHeight, &applied0));
 
   // Claim that this frame needs to be rotated for 90 degree.
   SetFrameRotation(&applied0, webrtc::kVideoRotation_90);
 
   // Apply rotation on frame 1. Output should be different from frame 1.
   WebRtcVideoFrame* applied90 =
       const_cast<WebRtcVideoFrame*>(static_cast<const WebRtcVideoFrame*>(
           applied0.GetCopyWithRotationApplied()));
   EXPECT_TRUE(applied90);
   EXPECT_EQ(applied90->rotation(), webrtc::kVideoRotation_0);
   EXPECT_FALSE(IsEqual(applied0, *applied90, 0));
 
   // Claim the frame 2 needs to be rotated for another 270 degree. The output
   // from frame 2 rotation should be the same as frame 1.
   SetFrameRotation(applied90, webrtc::kVideoRotation_270);
   const VideoFrame* applied360 = applied90->GetCopyWithRotationApplied();
   EXPECT_TRUE(applied360);
   EXPECT_EQ(applied360->rotation(), webrtc::kVideoRotation_0);
   EXPECT_TRUE(IsEqual(applied0, *applied360, 0));
 }
 
 }  // namespace cricket