| Index: printing/page_setup_unittest.cc
|
| diff --git a/printing/page_setup_unittest.cc b/printing/page_setup_unittest.cc
|
| index be0e4b695aa7a343434c9000f8686ea3b364a499..8d65e72bebae2da86d8cf07bad20898433f404e6 100644
|
| --- a/printing/page_setup_unittest.cc
|
| +++ b/printing/page_setup_unittest.cc
|
| @@ -68,29 +68,32 @@ TEST(PageSetupTest, Random) {
|
|
|
| // Test values.
|
| EXPECT_EQ(page_size, setup.physical_size()) << seed << " " <<
|
| - page_size.ToString() << " " << printable_area << " " << kTextHeight;
|
| + page_size.ToString() << " " << printable_area.ToString() <<
|
| + " " << kTextHeight;
|
| EXPECT_EQ(overlay_area, setup.overlay_area()) << seed << " " <<
|
| - page_size.ToString() << " " << printable_area << " " << kTextHeight;
|
| + page_size.ToString() << " " << printable_area.ToString() <<
|
| + " " << kTextHeight;
|
| EXPECT_EQ(content_area, setup.content_area()) << seed << " " <<
|
| - page_size.ToString() << " " << printable_area << " " << kTextHeight;
|
| + page_size.ToString() << " " << printable_area.ToString() <<
|
| + " " << kTextHeight;
|
|
|
| EXPECT_EQ(effective_margins.header, setup.effective_margins().header) <<
|
| - seed << " " << page_size.ToString() << " " << printable_area <<
|
| + seed << " " << page_size.ToString() << " " << printable_area.ToString() <<
|
| " " << kTextHeight;
|
| EXPECT_EQ(effective_margins.footer, setup.effective_margins().footer) <<
|
| - seed << " " << page_size.ToString() << " " << printable_area <<
|
| + seed << " " << page_size.ToString() << " " << printable_area.ToString() <<
|
| " " << kTextHeight;
|
| EXPECT_EQ(effective_margins.left, setup.effective_margins().left) << seed <<
|
| - " " << page_size.ToString() << " " << printable_area <<
|
| + " " << page_size.ToString() << " " << printable_area.ToString() <<
|
| " " << kTextHeight;
|
| EXPECT_EQ(effective_margins.top, setup.effective_margins().top) << seed <<
|
| - " " << page_size.ToString() << " " << printable_area <<
|
| + " " << page_size.ToString() << " " << printable_area.ToString() <<
|
| " " << kTextHeight;
|
| EXPECT_EQ(effective_margins.right, setup.effective_margins().right) << seed <<
|
| - " " << page_size.ToString() << " " << printable_area <<
|
| + " " << page_size.ToString() << " " << printable_area.ToString() <<
|
| " " << kTextHeight;
|
| EXPECT_EQ(effective_margins.bottom, setup.effective_margins().bottom) <<
|
| - seed << " " << page_size.ToString() << " " << printable_area <<
|
| + seed << " " << page_size.ToString() << " " << printable_area.ToString() <<
|
| " " << kTextHeight;
|
| }
|
|
|
| @@ -131,28 +134,30 @@ TEST(PageSetupTest, HardCoded) {
|
|
|
| // Test values.
|
| EXPECT_EQ(page_size, setup.physical_size()) << " " << page_size.ToString() <<
|
| - " " << printable_area << " " << kTextHeight;
|
| + " " << printable_area.ToString() << " " << kTextHeight;
|
| EXPECT_EQ(overlay_area, setup.overlay_area()) << " " <<
|
| - page_size.ToString() << " " << printable_area << " " << kTextHeight;
|
| + page_size.ToString() << " " << printable_area.ToString() <<
|
| + " " << kTextHeight;
|
| EXPECT_EQ(content_area, setup.content_area()) << " " <<
|
| - page_size.ToString() << " " << printable_area << " " << kTextHeight;
|
| + page_size.ToString() << " " << printable_area.ToString() <<
|
| + " " << kTextHeight;
|
|
|
| EXPECT_EQ(effective_margins.header, setup.effective_margins().header) <<
|
| " " << page_size.ToString() << " " <<
|
| - printable_area << " " << kTextHeight;
|
| + printable_area.ToString() << " " << kTextHeight;
|
| EXPECT_EQ(effective_margins.footer, setup.effective_margins().footer) <<
|
| - " " << page_size.ToString() << " " << printable_area <<
|
| + " " << page_size.ToString() << " " << printable_area.ToString() <<
|
| " " << kTextHeight;
|
| EXPECT_EQ(effective_margins.left, setup.effective_margins().left) <<
|
| - " " << page_size.ToString() << " " << printable_area <<
|
| + " " << page_size.ToString() << " " << printable_area.ToString() <<
|
| " " << kTextHeight;
|
| EXPECT_EQ(effective_margins.top, setup.effective_margins().top) <<
|
| - " " << page_size.ToString() << " " << printable_area <<
|
| + " " << page_size.ToString() << " " << printable_area.ToString() <<
|
| " " << kTextHeight;
|
| EXPECT_EQ(effective_margins.right, setup.effective_margins().right) <<
|
| - " " << page_size.ToString() << " " << printable_area <<
|
| + " " << page_size.ToString() << " " << printable_area.ToString() <<
|
| " " << kTextHeight;
|
| EXPECT_EQ(effective_margins.bottom, setup.effective_margins().bottom) <<
|
| - " " << page_size.ToString() << " " << printable_area <<
|
| + " " << page_size.ToString() << " " << printable_area.ToString() <<
|
| " " << kTextHeight;
|
| }
|
|
|