diff options
| author | vrk@google.com <vrk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-19 20:18:33 +0000 |
|---|---|---|
| committer | vrk@google.com <vrk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-19 20:18:33 +0000 |
| commit | 2975fa5391dfd5c57def10929408d814c4acaf6d (patch) | |
| tree | 32e17ca77ac82b2adf3e36b23f3f7b7918b6b509 /media/base/pipeline_impl_unittest.cc | |
| parent | ef03e1ded45fe5dff2b3a783b1be554b5064dfea (diff) | |
| download | chromium_src-2975fa5391dfd5c57def10929408d814c4acaf6d.zip chromium_src-2975fa5391dfd5c57def10929408d814c4acaf6d.tar.gz chromium_src-2975fa5391dfd5c57def10929408d814c4acaf6d.tar.bz2 | |
Reland r101418: Fix aspect ratio and clarify video frame dimensions
Fixes shared build errors for windows and linux.
BUG=18941,94861
TEST=shared builds compile
TBR=acolwell
Review URL: http://codereview.chromium.org/7932005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101808 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base/pipeline_impl_unittest.cc')
| -rw-r--r-- | media/base/pipeline_impl_unittest.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/media/base/pipeline_impl_unittest.cc b/media/base/pipeline_impl_unittest.cc index 66b430a..c1cd68d 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) { |