Merged VideoSurface, VideoFrame and VideoFrameImpl in VideoFrame.

media/filters/ffmpeg_video_decode_engine_unittest.cc

Index: media/filters/ffmpeg_video_decode_engine_unittest.cc
diff --git a/media/filters/ffmpeg_video_decode_engine_unittest.cc b/media/filters/ffmpeg_video_decode_engine_unittest.cc
index 4d56866f08dbb6e5317a94cfd263b0f5d9039d77..449a67c259d05554a1b91bf9af9c4c991e655d69 100644
--- a/media/filters/ffmpeg_video_decode_engine_unittest.cc
+++ b/media/filters/ffmpeg_video_decode_engine_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
@@ -167,19 +167,19 @@ TEST_F(FFmpegVideoDecodeEngineTest, DecodeFrame_DecodeError) {
 TEST_F(FFmpegVideoDecodeEngineTest, GetSurfaceFormat) {
   // YV12 formats.
   codec_context_.pix_fmt = PIX_FMT_YUV420P;
-  EXPECT_EQ(VideoSurface::YV12, test_engine_->GetSurfaceFormat());
+  EXPECT_EQ(VideoFrame::YV12, test_engine_->GetSurfaceFormat());
   codec_context_.pix_fmt = PIX_FMT_YUVJ420P;
-  EXPECT_EQ(VideoSurface::YV12, test_engine_->GetSurfaceFormat());
+  EXPECT_EQ(VideoFrame::YV12, test_engine_->GetSurfaceFormat());
 
   // YV16 formats.
   codec_context_.pix_fmt = PIX_FMT_YUV422P;
-  EXPECT_EQ(VideoSurface::YV16, test_engine_->GetSurfaceFormat());
+  EXPECT_EQ(VideoFrame::YV16, test_engine_->GetSurfaceFormat());
   codec_context_.pix_fmt = PIX_FMT_YUVJ422P;
-  EXPECT_EQ(VideoSurface::YV16, test_engine_->GetSurfaceFormat());
+  EXPECT_EQ(VideoFrame::YV16, test_engine_->GetSurfaceFormat());
 
   // Invalid value.
   codec_context_.pix_fmt = PIX_FMT_NONE;
-  EXPECT_EQ(VideoSurface::INVALID, test_engine_->GetSurfaceFormat());
+  EXPECT_EQ(VideoFrame::INVALID, test_engine_->GetSurfaceFormat());
 }
 
 }  // namespace media