[printing] Convert PrintHostMsg_PrintingFailed to Mojo

This CL converts PrintHostMsg_PrintingFailed message to
PrintingFailed() in mojom::PrintManagerHost.

Bug: 1008939
Change-Id: I9fa3b5d5ca1db492aeaa23cc3a13f467d3149c29
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2377264
Commit-Queue: Julie Kim <jkim@igalia.com>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Reviewed-by: Eric Seckler <eseckler@chromium.org>
Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Reviewed-by: Jeremy Roman <jbroman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#804533}

chrome/browser/printing/print_view_manager_base.cc

@@ -357,8 +357,8 @@ void PrintViewManagerBase::OnGetDefaultPrintSettings(
   NOTREACHED() << "should be handled by printing::PrintingMessageFilter";
 }
 
-void PrintViewManagerBase::OnPrintingFailed(int cookie) {
-  PrintManager::OnPrintingFailed(cookie);
+void PrintViewManagerBase::PrintingFailed(int32_t cookie) {
+  PrintManager::PrintingFailed(cookie);
 
 #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
   ShowPrintErrorDialog();

chrome/browser/printing/print_view_manager_base.h

@@ -74,6 +74,7 @@ class PrintViewManagerBase : public content::NotificationObserver,
   // mojom::PrintManagerHost:
   void DidGetPrintedPagesCount(int32_t cookie, int32_t number_pages) override;
   void ShowInvalidPrinterSettingsError() override;
+  void PrintingFailed(int32_t cookie) override;
 
  protected:
   explicit PrintViewManagerBase(content::WebContents* web_contents);
@@ -122,7 +123,6 @@ class PrintViewManagerBase : public content::NotificationObserver,
       std::unique_ptr<DelayedFrameDispatchHelper> helper) override;
   void OnGetDefaultPrintSettings(content::RenderFrameHost* render_frame_host,
                                  IPC::Message* reply_msg) override;
-  void OnPrintingFailed(int cookie) override;
   void OnScriptedPrint(content::RenderFrameHost* render_frame_host,
                        const mojom::ScriptedPrintParams& params,
                        IPC::Message* reply_msg) override;

components/printing/browser/print_manager.cc

@@ -92,8 +92,6 @@ bool PrintManager::OnMessageReceived(
                                     FrameDispatchHelper::OnScriptedPrint)
     IPC_MESSAGE_FORWARD_DELAY_REPLY(PrintHostMsg_DidPrintDocument, &helper,
                                     FrameDispatchHelper::OnDidPrintDocument);
-
-    IPC_MESSAGE_HANDLER(PrintHostMsg_PrintingFailed, OnPrintingFailed)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
@@ -119,7 +117,7 @@ void PrintManager::DidShowPrintDialog() {}
 
 void PrintManager::ShowInvalidPrinterSettingsError() {}
 
-void PrintManager::OnPrintingFailed(int cookie) {
+void PrintManager::PrintingFailed(int32_t cookie) {
   if (cookie != cookie_) {
     NOTREACHED();
     return;

components/printing/browser/print_manager.h

@@ -44,6 +44,7 @@ class PrintManager : public content::WebContentsObserver,
   void DidGetDocumentCookie(int32_t cookie) override;
   void DidShowPrintDialog() override;
   void ShowInvalidPrinterSettingsError() override;
+  void PrintingFailed(int32_t cookie) override;
 
  protected:
   explicit PrintManager(content::WebContents* contents);
@@ -99,7 +100,6 @@ class PrintManager : public content::WebContentsObserver,
   virtual void OnGetDefaultPrintSettings(
       content::RenderFrameHost* render_frame_host,
       IPC::Message* reply_msg) = 0;
-  virtual void OnPrintingFailed(int cookie);
   virtual void OnScriptedPrint(content::RenderFrameHost* render_frame_host,
                                const mojom::ScriptedPrintParams& params,
                                IPC::Message* reply_msg) = 0;

components/printing/common/print.mojom

@@ -285,4 +285,7 @@ interface PrintManagerHost {
 
   // Tells the browser that there are invalid printer settings.
   ShowInvalidPrinterSettingsError();
+
+  // Tells the browser printing failed.
+  PrintingFailed(int32 cookie);
 };

components/printing/common/print_messages.h

@@ -353,13 +353,7 @@ IPC_SYNC_MESSAGE_ROUTED1_1(PrintHostMsg_CheckForCancel,
 IPC_MESSAGE_ROUTED2(PrintHostMsg_MetafileReadyForPrinting,
                     printing::mojom::DidPreviewDocumentParams /* params */,
                     printing::mojom::PreviewIds /* ids */)
-#endif  // BUILDFLAG(ENABLE_PRINT_PREVIEW)
-
-// Tell the browser printing failed.
-IPC_MESSAGE_ROUTED1(PrintHostMsg_PrintingFailed,
-                    int /* document cookie */)
 
-#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
 // Run a nested run loop in the renderer until print preview for
 // window.print() finishes.
 IPC_SYNC_MESSAGE_ROUTED0_0(PrintHostMsg_SetupScriptedPrintPreview)

components/printing/renderer/print_render_frame_helper.cc

@@ -1925,7 +1925,7 @@ void PrintRenderFrameHelper::DidFinishPrinting(PrintingResult result) {
 
     case FAIL_PRINT:
       if (notify_browser_of_print_failure_ && print_pages_params_) {
-        Send(new PrintHostMsg_PrintingFailed(routing_id(), cookie));
+        GetPrintManagerHost()->PrintingFailed(cookie);
       }
       break;
 

components/printing/test/print_render_frame_helper_browsertest.cc

@@ -785,12 +785,6 @@ class MAYBE_PrintRenderFrameHelperPreviewTest
     }
   }
 
-  void VerifyPrintFailed(bool expect_fail) {
-    bool print_failed = !!render_thread_->sink().GetUniqueMessageMatching(
-        PrintHostMsg_PrintingFailed::ID);
-    EXPECT_EQ(expect_fail, print_failed);
-  }
-
   void VerifyPrintPreviewInvalidPrinterSettings(bool expect_invalid_settings) {
     EXPECT_EQ(expect_invalid_settings, preview_ui()->invalid_printer_setting());
   }

headless/lib/browser/headless_print_manager.cc

@@ -259,7 +259,7 @@ void HeadlessPrintManager::ShowInvalidPrinterSettingsError() {
   ReleaseJob(INVALID_PRINTER_SETTINGS);
 }
 
-void HeadlessPrintManager::OnPrintingFailed(int cookie) {
+void HeadlessPrintManager::PrintingFailed(int32_t cookie) {
   ReleaseJob(PRINTING_FAILED);
 }
 

headless/lib/browser/headless_print_manager.h

@@ -70,6 +70,7 @@ class HeadlessPrintManager
 
   // printing::mojom::PrintManagerHost:
   void ShowInvalidPrinterSettingsError() override;
+  void PrintingFailed(int32_t cookie) override;
 
   static std::string PrintResultToString(PrintResult result);
   // Exported for tests.
@@ -104,7 +105,6 @@ class HeadlessPrintManager
       std::unique_ptr<DelayedFrameDispatchHelper> helper) override;
   void OnGetDefaultPrintSettings(content::RenderFrameHost* render_frame_host,
                                  IPC::Message* reply_msg) override;
-  void OnPrintingFailed(int cookie) override;
   void OnScriptedPrint(content::RenderFrameHost* render_frame_host,
                        const printing::mojom::ScriptedPrintParams& params,
                        IPC::Message* reply_msg) override;