Remove VideoDecoder::natural_size() & added VideoFrame::natural_size().

webkit/media/skcanvas_video_renderer_unittest.cc

 // Copyright (c) 2012 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.
 
 #include "media/base/video_frame.h"
 #include "media/base/video_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkDevice.h"
 #include "webkit/media/skcanvas_video_renderer.h"
@@ skipping 58 matching lines @@
 
   SkDevice fast_path_device_;
   SkCanvas fast_path_canvas_;
   SkDevice slow_path_device_;
   SkCanvas slow_path_canvas_;
 
   DISALLOW_COPY_AND_ASSIGN(SkCanvasVideoRendererTest);
 };
 
 SkCanvasVideoRendererTest::SkCanvasVideoRendererTest()
-    : natural_frame_(VideoFrame::CreateBlackFrame(kWidth, kHeight)),
-      larger_frame_(VideoFrame::CreateBlackFrame(kWidth * 2, kHeight * 2)),
-      smaller_frame_(VideoFrame::CreateBlackFrame(kWidth / 2, kHeight / 2)),
+    : natural_frame_(VideoFrame::CreateBlackFrame(gfx::Size(kWidth, kHeight))),
+      larger_frame_(VideoFrame::CreateBlackFrame(
+          gfx::Size(kWidth * 2, kHeight * 2))),
+      smaller_frame_(VideoFrame::CreateBlackFrame(
+          gfx::Size(kWidth / 2, kHeight / 2))),
       fast_path_device_(SkBitmap::kARGB_8888_Config, kWidth, kHeight, true),
       fast_path_canvas_(&fast_path_device_),
       slow_path_device_(SkBitmap::kARGB_8888_Config, kWidth, kHeight, false),
       slow_path_canvas_(&slow_path_device_) {
   // Give each frame a unique timestamp.
   natural_frame_->SetTimestamp(base::TimeDelta::FromMilliseconds(1));
   larger_frame_->SetTimestamp(base::TimeDelta::FromMilliseconds(2));
   smaller_frame_->SetTimestamp(base::TimeDelta::FromMilliseconds(3));
 }
 
@@ skipping 99 matching lines @@
 TEST_F(SkCanvasVideoRendererTest, SlowPaint_SameVideoFrame) {
   Paint(natural_frame(), slow_path_canvas(), kRed);
   EXPECT_EQ(SK_ColorRED, GetColor(slow_path_canvas()));
 
   // Slow paints can get cached, expect the old color value.
   Paint(natural_frame(), slow_path_canvas(), kBlue);
   EXPECT_EQ(SK_ColorRED, GetColor(slow_path_canvas()));
 }
 
 }  // namespace webkit_media