Remove extra page_count parameter in print preview code

A document page count was being passed around in a bunch of places
only to record it as a metric. Since this metric is now obsolete and
no longer being recorded, remove this extra parameter where it isn't
needed.

Bug: None
Change-Id: I2723b8af1786c4bf5fbfdad8f7c66b25959f7408
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1937586Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Rebekah Potter <rbpotter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#722598}

chrome/browser/printing/print_preview_message_handler.cc

@@ -247,8 +247,7 @@ void PrintPreviewMessageHandler::OnMetafileReadyForPrinting(
     auto callback = base::BindOnce(
         &PrintPreviewMessageHandler::OnCompositeOrCompleteDocumentToPdfDone,
         weak_ptr_factory_.GetWeakPtr(),
-        composite_document_using_individual_pages, params.expected_pages_count,
-        params.document_cookie, ids);
+        composite_document_using_individual_pages, params.document_cookie, ids);
     if (composite_document_using_individual_pages) {
       // Page metafile is used to composite into the document at same time.
       // Need to provide particulars of how many pages are required before
@@ -269,7 +268,7 @@ void PrintPreviewMessageHandler::OnMetafileReadyForPrinting(
     }
   } else {
     NotifyUIPreviewDocumentReady(
-        print_preview_ui, params.expected_pages_count, ids,
+        print_preview_ui, ids,
         base::RefCountedSharedMemoryMapping::CreateFromWholeRegion(
             content.metafile_data_region));
   }
@@ -350,7 +349,6 @@ void PrintPreviewMessageHandler::NotifyUIPreviewPageReady(
 
 void PrintPreviewMessageHandler::NotifyUIPreviewDocumentReady(
     PrintPreviewUI* print_preview_ui,
-    int page_count,
     const PrintHostMsg_PreviewIds& ids,
     scoped_refptr<base::RefCountedMemory> data_bytes) {
   if (!data_bytes || !data_bytes->size())
@@ -360,7 +358,7 @@ void PrintPreviewMessageHandler::NotifyUIPreviewDocumentReady(
   if (PrintPreviewUI::ShouldCancelRequest(ids))
     return;
 
-  print_preview_ui->OnPreviewDataIsAvailable(page_count, std::move(data_bytes),
+  print_preview_ui->OnPreviewDataIsAvailable(std::move(data_bytes),
                                              ids.request_id);
 }
 
@@ -445,7 +443,6 @@ void PrintPreviewMessageHandler::OnNupPdfConvertDone(
 
 void PrintPreviewMessageHandler::OnCompositeOrCompleteDocumentToPdfDone(
     bool composite_document_using_individual_pages,
-    int page_count,
     int document_cookie,
     const PrintHostMsg_PreviewIds& ids,
     mojom::PdfCompositor::Status status,
@@ -467,7 +464,7 @@ void PrintPreviewMessageHandler::OnCompositeOrCompleteDocumentToPdfDone(
   int pages_per_sheet = print_preview_ui->pages_per_sheet();
   if (pages_per_sheet == 1) {
     NotifyUIPreviewDocumentReady(
-        print_preview_ui, page_count, ids,
+        print_preview_ui, ids,
         base::RefCountedSharedMemoryMapping::CreateFromWholeRegion(region));
   } else {
     auto* client = PdfNupConverterClient::FromWebContents(web_contents());
@@ -484,8 +481,7 @@ void PrintPreviewMessageHandler::OnCompositeOrCompleteDocumentToPdfDone(
         mojo::WrapCallbackWithDefaultInvokeIfNotRun(
             base::BindOnce(
                 &PrintPreviewMessageHandler::OnNupPdfDocumentConvertDone,
-                weak_ptr_factory_.GetWeakPtr(),
-                (page_count + pages_per_sheet - 1) / pages_per_sheet, ids),
+                weak_ptr_factory_.GetWeakPtr(), ids),
             mojom::PdfNupConverter::Status::CONVERSION_FAILURE,
             base::ReadOnlySharedMemoryRegion()));
   }
@@ -503,7 +499,6 @@ void PrintPreviewMessageHandler::OnPrepareForDocumentToPdfDone(
 }
 
 void PrintPreviewMessageHandler::OnNupPdfDocumentConvertDone(
-    int page_count,
     const PrintHostMsg_PreviewIds& ids,
     mojom::PdfNupConverter::Status status,
     base::ReadOnlySharedMemoryRegion region) {
@@ -520,7 +515,7 @@ void PrintPreviewMessageHandler::OnNupPdfDocumentConvertDone(
     return;
 
   NotifyUIPreviewDocumentReady(
-      print_preview_ui, page_count, ids,
+      print_preview_ui, ids,
       base::RefCountedSharedMemoryMapping::CreateFromWholeRegion(region));
 }
 

chrome/browser/printing/print_preview_message_handler.h

@@ -98,7 +98,6 @@ class PrintPreviewMessageHandler
       scoped_refptr<base::RefCountedMemory> data_bytes);
   void NotifyUIPreviewDocumentReady(
       PrintPreviewUI* print_preview_ui,
-      int page_count,
       const PrintHostMsg_PreviewIds& ids,
       scoped_refptr<base::RefCountedMemory> data_bytes);
 
@@ -110,7 +109,6 @@ class PrintPreviewMessageHandler
                               base::ReadOnlySharedMemoryRegion region);
   void OnCompositeOrCompleteDocumentToPdfDone(
       bool composite_document_using_individual_pages,
-      int page_count,
       int document_cookie,
       const PrintHostMsg_PreviewIds& ids,
       mojom::PdfCompositor::Status status,
@@ -122,8 +120,7 @@ class PrintPreviewMessageHandler
                            const PrintHostMsg_PreviewIds& ids,
                            mojom::PdfNupConverter::Status status,
                            base::ReadOnlySharedMemoryRegion region);
-  void OnNupPdfDocumentConvertDone(int page_count,
-                                   const PrintHostMsg_PreviewIds& ids,
+  void OnNupPdfDocumentConvertDone(const PrintHostMsg_PreviewIds& ids,
                                    mojom::PdfNupConverter::Status status,
                                    base::ReadOnlySharedMemoryRegion region);
 

chrome/browser/ui/webui/print_preview/print_preview_ui.cc

@@ -672,12 +672,8 @@ void PrintPreviewUI::OnDidPreviewPage(
 }
 
 void PrintPreviewUI::OnPreviewDataIsAvailable(
-    int expected_pages_count,
     scoped_refptr<base::RefCountedMemory> data,
     int preview_request_id) {
-  VLOG(1) << "Print preview request finished with "
-          << expected_pages_count << " pages";
-
   if (!initial_preview_start_time_.is_null()) {
     UMA_HISTOGRAM_TIMES("PrintPreview.InitialDisplayTime",
                         base::TimeTicks::Now() - initial_preview_start_time_);

chrome/browser/ui/webui/print_preview/print_preview_ui.h

@@ -156,10 +156,8 @@ class PrintPreviewUI : public ConstrainedWebDialogUI {
                         int preview_request_id);
 
   // Notifies the Web UI renderer that preview data is available.
-  // |expected_pages_count| specifies the total number of pages.
   // |preview_request_id| indicates which request resulted in this response.
-  void OnPreviewDataIsAvailable(int expected_pages_count,
-                                scoped_refptr<base::RefCountedMemory> data,
+  void OnPreviewDataIsAvailable(scoped_refptr<base::RefCountedMemory> data,
                                 int preview_request_id);
 
   // Notifies the Web UI that the print preview failed to render for the request