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

chrome/renderer/print_web_view_helper_win.cc

Index: chrome/renderer/print_web_view_helper_win.cc
diff --git a/chrome/renderer/print_web_view_helper_win.cc b/chrome/renderer/print_web_view_helper_win.cc
index e0332c85dbe012922bf7ad6da7f965fe8cf0f644..871f8b2e6e337f8a20551ac1a8f17046c41bd85c 100644
--- a/chrome/renderer/print_web_view_helper_win.cc
+++ b/chrome/renderer/print_web_view_helper_win.cc
@@ -108,7 +108,7 @@ void PrintWebViewHelper::PrintPage(const ViewMsg_PrintPage_Params& params,
                                    &(page_params.metafile_data_handle))) {
     page_params.data_size = 0;
   }
-  metafile->CloseEmf();
+  metafile->Close();
   if (!Send(new ViewHostMsg_DuplicateSection(
           routing_id(),
           page_params.metafile_data_handle,
@@ -180,7 +180,7 @@ void PrintWebViewHelper::CreatePreviewDocument(
     preview_params.data_size = 0;
     preview_params.expected_pages_count = 0;
   }
-  metafile->CloseEmf();
+  metafile->Close();
   if (!Send(new ViewHostMsg_DuplicateSection(
           routing_id(),
           preview_params.metafile_data_handle,
@@ -287,7 +287,7 @@ void PrintWebViewHelper::RenderPage(
     DCHECK(hdc);
     skia::PlatformDevice::InitializeDC(hdc);
 
-    RECT metafile_bounds = (*metafile)->GetBounds().ToRECT();
+    RECT metafile_bounds = (*metafile)->GetPageBounds(1).ToRECT();
     // Process the old metafile, placing all non-AlphaBlend calls into the
     // new metafile, and copying the results of all the AlphaBlend calls
     // from the bitmap DC.