Revert of Cleanup of webrtc::VideoFrame.

webrtc/modules/video_processing/test/denoiser_test.cc

 /*
  *  Copyright (c) 2015 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.
  */
 
 #include <string.h>
 
 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
 #include "webrtc/modules/video_processing/include/video_processing.h"
 #include "webrtc/modules/video_processing/test/video_processing_unittest.h"
 #include "webrtc/modules/video_processing/video_denoiser.h"
-#include "webrtc/test/frame_utils.h"
 
 namespace webrtc {
 
 TEST_F(VideoProcessingTest, CopyMem) {
   rtc::scoped_ptr<DenoiserFilter> df_c(DenoiserFilter::Create(false));
   rtc::scoped_ptr<DenoiserFilter> df_sse_neon(DenoiserFilter::Create(true));
   uint8_t src[16 * 16], dst[16 * 16];
   for (int i = 0; i < 16; ++i) {
     for (int j = 0; j < 16; ++j) {
       src[i * 16 + j] = i * 16 + j;
@@ skipping 114 matching lines @@
   while (fread(video_buffer.get(), 1, frame_length_, source_file_) ==
          frame_length_) {
     // Using ConvertToI420 to add stride to the image.
     EXPECT_EQ(0, ConvertToI420(kI420, video_buffer.get(), 0, 0, width_, height_,
                                0, kVideoRotation_0, &video_frame_));
 
     denoiser_c.DenoiseFrame(video_frame_, &denoised_frame_c);
     denoiser_sse_neon.DenoiseFrame(video_frame_, &denoised_frame_sse_neon);
 
     // Denoising results should be the same for C and SSE/NEON denoiser.
-    ASSERT_TRUE(test::FramesEqual(denoised_frame_c, denoised_frame_sse_neon));
+    ASSERT_EQ(true, denoised_frame_c.EqualsFrame(denoised_frame_sse_neon));
   }
   ASSERT_NE(0, feof(source_file_)) << "Error reading source file";
 }
 
 }  // namespace webrtc