Reland r101418: Fix aspect ratio and clarify video frame dimensions

content/renderer/media/rtc_video_decoder_unittest.cc

 // Copyright (c) 2011 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 "content/renderer/media/rtc_video_decoder.h"
 
 #include <deque>
 
 #include "base/bind.h"
 #include "base/memory/singleton.h"
@@ skipping 142 matching lines @@
 const int RTCVideoDecoderTest::kWidth = 176;
 const int RTCVideoDecoderTest::kHeight = 144;
 const char* RTCVideoDecoderTest::kUrl = "media://remote/0";
 const PipelineStatistics RTCVideoDecoderTest::kStatistics;
 
 TEST_F(RTCVideoDecoderTest, Initialize_Successful) {
   InitializeDecoderSuccessfully();
 
   // Test that the output media format is an uncompressed video surface that
   // matches the dimensions specified by RTC.
-  EXPECT_EQ(kWidth, decoder_->width());
-  EXPECT_EQ(kHeight, decoder_->height());
+  EXPECT_EQ(kWidth, decoder_->natural_size().width());
+  EXPECT_EQ(kHeight, decoder_->natural_size().height());
 }
 
 TEST_F(RTCVideoDecoderTest, DoSeek) {
   const base::TimeDelta kZero;
 
   InitializeDecoderSuccessfully();
 
   decoder_->set_consume_video_frame_callback(
       base::Bind(&MockVideoRenderer::ConsumeVideoFrame,
                  base::Unretained(renderer_.get())));
@@ skipping 33 matching lines @@
 
   message_loop_.RunAllPending();
   EXPECT_EQ(RTCVideoDecoder::kNormal, decoder_->state_);
 }
 
 TEST_F(RTCVideoDecoderTest, DoSetSize) {
   InitializeDecoderSuccessfully();
 
   int new_width = kWidth * 2;
   int new_height = kHeight * 2;
+  gfx::Size new_natural_size(new_width, new_height);
   int new_reserved = 0;
 
   EXPECT_CALL(host_,
-              SetVideoSize(new_width, new_height)).WillRepeatedly(Return());
+              SetNaturalVideoSize(new_natural_size)).WillRepeatedly(Return());
 
   decoder_->SetSize(new_width, new_height, new_reserved);
 
-  EXPECT_EQ(new_width, decoder_->width());
-  EXPECT_EQ(new_height, decoder_->height());
+  EXPECT_EQ(new_width, decoder_->natural_size().width());
+  EXPECT_EQ(new_height, decoder_->natural_size().height());
 
   message_loop_.RunAllPending();
 }