Reland r101418: Fix aspect ratio and clarify video frame dimensions

media/base/pipeline_impl_unittest.cc

Index: media/base/pipeline_impl_unittest.cc
diff --git a/media/base/pipeline_impl_unittest.cc b/media/base/pipeline_impl_unittest.cc
index 66b430ab5a04bf8d8a7f7becf1e95f4250bd10c9..c1cd68d744e77405466f0b34914bb7099cde3870 100644
--- a/media/base/pipeline_impl_unittest.cc
+++ b/media/base/pipeline_impl_unittest.cc
@@ -15,6 +15,7 @@
 #include "media/base/mock_callback.h"
 #include "media/base/mock_filters.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/gfx/size.h"
 
 using ::testing::_;
 using ::testing::DeleteArg;
@@ -308,11 +309,10 @@ TEST_F(PipelineImplTest, NotStarted) {
   EXPECT_EQ(0, pipeline_->GetTotalBytes());
 
   // Should always get set to zero.
-  size_t width = 1u;
-  size_t height = 1u;
-  pipeline_->GetVideoSize(&width, &height);
-  EXPECT_EQ(0u, width);
-  EXPECT_EQ(0u, height);
+  gfx::Size size(1, 1);
+  pipeline_->GetNaturalVideoSize(&size);
+  EXPECT_EQ(0, size.width());
+  EXPECT_EQ(0, size.height());
 }
 
 TEST_F(PipelineImplTest, NeverInitializes) {