Merge 165517 - Code cleanup. No functional changes.

chrome/renderer/print_web_view_helper_linux.cc

Index: chrome/renderer/print_web_view_helper_linux.cc
===================================================================
--- chrome/renderer/print_web_view_helper_linux.cc	(revision 168376)
+++ chrome/renderer/print_web_view_helper_linux.cc	(working copy)
@@ -26,9 +26,11 @@
 using WebKit::WebFrame;
 using WebKit::WebNode;
 
-bool PrintWebViewHelper::RenderPreviewPage(int page_number) {
+bool PrintWebViewHelper::RenderPreviewPage(
+    int page_number,
+    const PrintMsg_Print_Params& print_params) {
   PrintMsg_PrintPage_Params page_params;
-  page_params.params = print_preview_context_.print_params();
+  page_params.params = print_params;
   page_params.page_number = page_number;
   scoped_ptr<printing::Metafile> draft_metafile;
   printing::Metafile* initial_render_metafile =
@@ -209,7 +211,7 @@
     PrintHeaderAndFooter(canvas.get(), params.page_number + 1,
                          print_preview_context_.total_page_count(),
                          scale_factor, page_layout_in_points,
-                         *header_footer_info_);
+                         *header_footer_info_, params.params);
   }
 
   // Done printing. Close the device context to retrieve the compiled metafile.