Reland of Delete webrtc::VideoFrame::CopyFrame.

webrtc/modules/video_processing/test/video_processing_unittest.cc

Index: webrtc/modules/video_processing/test/video_processing_unittest.cc
diff --git a/webrtc/modules/video_processing/test/video_processing_unittest.cc b/webrtc/modules/video_processing/test/video_processing_unittest.cc
index 43238bcd18d1b1fa583afe749312c81931e64b1f..259829ad8f8339c5f5cb8174559c5fa884bcbb80 100644
--- a/webrtc/modules/video_processing/test/video_processing_unittest.cc
+++ b/webrtc/modules/video_processing/test/video_processing_unittest.cc
@@ -250,9 +250,10 @@
 
   // Scale |resampled_source_frame| back to the source scale.
   VideoFrame resampled_source_frame;
-  resampled_source_frame.CopyFrame(*out_frame);
+  resampled_source_frame.ShallowCopy(*out_frame);
   // Compute PSNR against the cropped source frame and check expectation.
-  PreprocessFrameAndVerify(resampled_source_frame, cropped_source.width(),
+  PreprocessFrameAndVerify(resampled_source_frame,
+                           cropped_source.width(),
                            cropped_source.height(), vpm, out_frame);
   WriteProcessedFrameForVisualInspection(resampled_source_frame, *out_frame);