More pdf printing fixes for Windows

chromium_src/chrome/browser/printing/pdf_to_emf_converter.cc

@@ -38,6 +38,11 @@ namespace printing {
 
 namespace {
 
+void CloseFileOnBlockingTaskRunner(base::File temp_file) {
+base::AssertBlockingAllowed();
+temp_file.Close();
+}
+
 class PdfConverterImpl;
 
 // Allows to delete temporary directory after all temporary files created inside
@@ -71,7 +76,7 @@ class TempFile {
   explicit TempFile(base::File file)
       : file_(std::move(file)),
         blocking_task_runner_(base::SequencedTaskRunnerHandle::Get()) {
-    base::ThreadRestrictions::AssertIOAllowed();
+    base::AssertBlockingAllowed();
   }
   ~TempFile() {
     blocking_task_runner_->PostTask(

chromium_src/chrome/utility/printing_handler_win.cc

@@ -156,7 +156,7 @@ bool PrintingHandlerWin::RenderPdfPageToMetafile(int page_number,
 
   if (!chrome_pdf::RenderPDFPageToDC(
           &pdf_data_.front(), pdf_data_.size(), page_number, metafile.context(),
-          pdf_rendering_settings_.dpi,
+          pdf_rendering_settings_.dpi.width(), pdf_rendering_settings_.dpi.height(),
           pdf_rendering_settings_.area.x() - offset_x,
           pdf_rendering_settings_.area.y() - offset_y,
           pdf_rendering_settings_.area.width(),