Reorder PrintPreviewHandler::SendPageCountReady() parameters.

Most PrintPreviewHandler methods have the request ID last.

Change-Id: Ie5d21e108df05859fb5b11229a2f97bd0ae93ff1
Reviewed-on: https://chromium-review.googlesource.com/1184384Reviewed-by: Rebekah Potter <rbpotter@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#585319}

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

@@ -1241,8 +1241,8 @@ void PrintPreviewHandler::SendPrintPresetOptions(bool disable_scaling,
 }
 
 void PrintPreviewHandler::SendPageCountReady(int page_count,
-                                             int request_id,
-                                             int fit_to_page_scaling) {
+                                             int fit_to_page_scaling,
+                                             int request_id) {
   if (!ShouldReceiveRendererMessage(request_id))
     return;
 

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

@@ -93,8 +93,8 @@ class PrintPreviewHandler
 
   // Send the print preview page count and fit to page scaling
   void SendPageCountReady(int page_count,
-                          int request_id,
-                          int fit_to_page_scaling);
+                          int fit_to_page_scaling,
+                          int request_id);
 
   // Send the default page layout
   void SendPageLayoutReady(const base::DictionaryValue& layout,

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

@@ -694,7 +694,7 @@ TEST_F(PrintPreviewHandlerTest, SendPreviewUpdates) {
   AssertWebUIEventFired(*web_ui()->call_data().back(), "page-layout-ready");
 
   // 1 page document. Modifiable so send default 100 scaling.
-  handler()->SendPageCountReady(1, preview_request_id, 100);
+  handler()->SendPageCountReady(1, 100, preview_request_id);
   AssertWebUIEventFired(*web_ui()->call_data().back(), "page-count-ready");
 
   // Page at index 0 is ready.
@@ -714,7 +714,7 @@ TEST_F(PrintPreviewHandlerTest, SendPreviewUpdates) {
   handler()->SendPageLayoutReady(base::DictionaryValue(), false,
                                  preview_request_id);
   EXPECT_EQ(message_count, web_ui()->call_data().size());
-  handler()->SendPageCountReady(1, 0, -1);
+  handler()->SendPageCountReady(1, -1, 0);
   EXPECT_EQ(message_count, web_ui()->call_data().size());
   handler()->OnPrintPreviewReady(0, 0);
   EXPECT_EQ(message_count, web_ui()->call_data().size());

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

@@ -699,8 +699,8 @@ void PrintPreviewUI::OnDidStartPreview(
   DCHECK_GT(params.page_count, 0);
   if (g_testing_delegate)
     g_testing_delegate->DidGetPreviewPageCount(params.page_count);
-  handler_->SendPageCountReady(params.page_count, request_id,
-                               params.fit_to_page_scaling);
+  handler_->SendPageCountReady(params.page_count, params.fit_to_page_scaling,
+                               request_id);
 }
 
 void PrintPreviewUI::OnDidGetDefaultPageLayout(