Index: printing/printed_page_unittest.cc |
diff --git a/printing/printed_page_unittest.cc b/printing/printed_page_unittest.cc |
index d37d93a60cfac0c559bef6e0e192d35cfc59dd6e..795afe48771b6c7651a2582ff86d560554767cf4 100644 |
--- a/printing/printed_page_unittest.cc |
+++ b/printing/printed_page_unittest.cc |
@@ -12,8 +12,10 @@ TEST(PrintedPageTest, GetCenteredPageContentRect) { |
gfx::Rect page_content; |
// No centering. |
- page = new PrintedPage( |
- 1, NULL, gfx::Size(1200, 1200), gfx::Rect(0, 0, 400, 1100)); |
+ page = new PrintedPage(1, |
+ scoped_ptr<MetafilePlayer>(), |
+ gfx::Size(1200, 1200), |
+ gfx::Rect(0, 0, 400, 1100)); |
page->GetCenteredPageContentRect(gfx::Size(1000, 1000), &page_content); |
EXPECT_EQ(0, page_content.x()); |
EXPECT_EQ(0, page_content.y()); |
@@ -21,8 +23,10 @@ TEST(PrintedPageTest, GetCenteredPageContentRect) { |
EXPECT_EQ(1100, page_content.height()); |
// X centered. |
- page = new PrintedPage( |
- 1, NULL, gfx::Size(500, 1200), gfx::Rect(0, 0, 400, 1100)); |
+ page = new PrintedPage(1, |
+ scoped_ptr<MetafilePlayer>(), |
+ gfx::Size(500, 1200), |
+ gfx::Rect(0, 0, 400, 1100)); |
page->GetCenteredPageContentRect(gfx::Size(1000, 1000), &page_content); |
EXPECT_EQ(250, page_content.x()); |
EXPECT_EQ(0, page_content.y()); |
@@ -30,8 +34,10 @@ TEST(PrintedPageTest, GetCenteredPageContentRect) { |
EXPECT_EQ(1100, page_content.height()); |
// Y centered. |
- page = new PrintedPage( |
- 1, NULL, gfx::Size(1200, 500), gfx::Rect(0, 0, 400, 1100)); |
+ page = new PrintedPage(1, |
+ scoped_ptr<MetafilePlayer>(), |
+ gfx::Size(1200, 500), |
+ gfx::Rect(0, 0, 400, 1100)); |
page->GetCenteredPageContentRect(gfx::Size(1000, 1000), &page_content); |
EXPECT_EQ(0, page_content.x()); |
EXPECT_EQ(250, page_content.y()); |
@@ -39,8 +45,10 @@ TEST(PrintedPageTest, GetCenteredPageContentRect) { |
EXPECT_EQ(1100, page_content.height()); |
// Both X and Y centered. |
- page = |
- new PrintedPage(1, NULL, gfx::Size(500, 500), gfx::Rect(0, 0, 400, 1100)); |
+ page = new PrintedPage(1, |
+ scoped_ptr<MetafilePlayer>(), |
+ gfx::Size(500, 500), |
+ gfx::Rect(0, 0, 400, 1100)); |
page->GetCenteredPageContentRect(gfx::Size(1000, 1000), &page_content); |
EXPECT_EQ(250, page_content.x()); |
EXPECT_EQ(250, page_content.y()); |
@@ -50,8 +58,11 @@ TEST(PrintedPageTest, GetCenteredPageContentRect) { |
#if defined(OS_WIN) |
TEST(PrintedPageTest, Shrink) { |
- scoped_refptr<PrintedPage> page = new PrintedPage( |
- 1, NULL, gfx::Size(1200, 1200), gfx::Rect(0, 0, 400, 1100)); |
+ scoped_refptr<PrintedPage> page = |
+ new PrintedPage(1, |
+ scoped_ptr<MetafilePlayer>(), |
+ gfx::Size(1200, 1200), |
+ gfx::Rect(0, 0, 400, 1100)); |
EXPECT_EQ(0.0f, page->shrink_factor()); |
page->set_shrink_factor(0.2f); |
EXPECT_EQ(0.2f, page->shrink_factor()); |