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

media/filters/video_renderer_base_unittest.cc

Index: media/filters/video_renderer_base_unittest.cc
diff --git a/media/filters/video_renderer_base_unittest.cc b/media/filters/video_renderer_base_unittest.cc
index 9b38dfad0221fc0c54e7a0b2bd45980e5abfc7ff..d08670ebf347b749becafe58194f0e3d7e9ae202 100644
--- a/media/filters/video_renderer_base_unittest.cc
+++ b/media/filters/video_renderer_base_unittest.cc
@@ -94,9 +94,6 @@ class VideoRendererBaseTest : public ::testing::Test {
 
     InSequence s;
 
-    // We expect the video size to be set.
-    EXPECT_CALL(*this, OnNaturalSizeChanged(kNaturalSize));
-
     // Set playback rate before anything else happens.
     renderer_->SetPlaybackRate(1.0f);
 
@@ -116,6 +113,9 @@ class VideoRendererBaseTest : public ::testing::Test {
         base::Bind(&VideoRendererBaseTest::GetDuration,
                    base::Unretained(this)));
 
+    // We expect the video size to be set.
+    EXPECT_CALL(*this, OnNaturalSizeChanged(kNaturalSize));
+
     // Start prerolling.
     Preroll(0);
   }
@@ -253,8 +253,7 @@ class VideoRendererBaseTest : public ::testing::Test {
   // Creates a frame with given timestamp.
   scoped_refptr<VideoFrame> CreateFrame(int64 timestamp) {
     scoped_refptr<VideoFrame> frame =
-        VideoFrame::CreateFrame(VideoFrame::RGB32, kNaturalSize.width(),
-                                kNaturalSize.height(),
+        VideoFrame::CreateFrame(VideoFrame::RGB32, kNaturalSize, kNaturalSize,
                                 base::TimeDelta::FromMicroseconds(timestamp));
     return frame;
   }