Move VideoFrame and related declarations to webrtc/api/video.

webrtc/test/testsupport/metrics/video_metrics.cc

 /*
  *  Copyright (c) 2012 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 "webrtc/test/testsupport/metrics/video_metrics.h"
 
 #include <assert.h>
 #include <stdio.h>
 
 #include <algorithm>  // min_element, max_element
 #include <memory>
 
+#include "webrtc/api/video/video_frame.h"
+#include "webrtc/common_video/include/video_frame_buffer.h"
 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
 #include "webrtc/test/frame_utils.h"
-#include "webrtc/video_frame.h"
 #include "libyuv/convert.h"
 
 namespace webrtc {
 namespace test {
 
 // Copy here so our callers won't need to include libyuv for this constant.
 double kMetricsPerfectPSNR = kPerfectPSNR;
 
 // Used for calculating min and max values.
 static bool LessForFrameResultValue(const FrameResult& s1,
@@ skipping 151 matching lines @@
                       int width,
                       int height,
                       QualityMetricsResult* result) {
   assert(result != NULL);
   return CalculateMetrics(kSSIM, ref_filename, test_filename, width, height,
                           NULL, result);
 }
 
 }  // namespace test
 }  // namespace webrtc