Unifying NativeMetafile class interface (as much as possible) for Linux, Mac, Win

printing/emf_win_unittest.cc

Index: printing/emf_win_unittest.cc
diff --git a/printing/emf_win_unittest.cc b/printing/emf_win_unittest.cc
index 9d3aa00a20e22d0d68dff891d7e487fd1ed1ba36..f0bb7393db59405ec4a7a2b9ce5b9a749736a919 100644
--- a/printing/emf_win_unittest.cc
+++ b/printing/emf_win_unittest.cc
@@ -56,7 +56,7 @@ TEST(EmfTest, DC) {
   std::vector<BYTE> data;
   EXPECT_TRUE(emf.GetData(&data));
   EXPECT_EQ(data.size(), size);
-  emf.CloseEmf();
+  emf.Close();
   EXPECT_TRUE(DeleteDC(hdc));
 
   // Playback the data.
@@ -104,7 +104,7 @@ TEST_F(EmfPrintingTest, Enumerate) {
   context->NewPage();
   // Process one at a time.
   printing::Emf::Enumerator emf_enum(emf, context->context(),
-                                &emf.GetBounds().ToRECT());
+                                &emf.GetPageBounds(1).ToRECT());
   for (printing::Emf::Enumerator::const_iterator itr = emf_enum.begin();
        itr != emf_enum.end();
        ++itr) {
@@ -133,7 +133,7 @@ TEST_F(EmfPrintingTest, PageBreak) {
   while (pages) {
     EXPECT_TRUE(emf.StartPage());
     ::Rectangle(emf.hdc(), 10, 10, 190, 190);
-    EXPECT_TRUE(emf.EndPage());
+    EXPECT_TRUE(emf.FinishPage());
     --pages;
   }
   EXPECT_TRUE(emf.CloseDc());
@@ -141,7 +141,7 @@ TEST_F(EmfPrintingTest, PageBreak) {
   std::vector<BYTE> data;
   EXPECT_TRUE(emf.GetData(&data));
   EXPECT_EQ(data.size(), size);
-  emf.CloseEmf();
+  emf.Close();
 
   // Playback the data.
   DOCINFO di = {0};
@@ -181,7 +181,7 @@ TEST(EmfTest, FileBackedDC) {
   std::vector<BYTE> data;
   EXPECT_TRUE(emf.GetData(&data));
   EXPECT_EQ(data.size(), size);
-  emf.CloseEmf();
+  emf.Close();
   int64 file_size = 0;
   file_util::GetFileSize(metafile_path, &file_size);
   EXPECT_EQ(size, file_size);
@@ -194,7 +194,7 @@ TEST(EmfTest, FileBackedDC) {
   RECT output_rect = {0, 0, 10, 10};
   EXPECT_TRUE(emf.Playback(hdc, &output_rect));
   EXPECT_TRUE(DeleteDC(hdc));
-  emf.CloseEmf();
+  emf.Close();
 }
 
 }  // namespace printing