Adaptations for Chromium 78

Including removal of renderer service.

[ChangeLog][QWebEngineSetting] XSS Auditing has been removed, and
XSSAuditingEnabled no longer has any effect.

Change-Id: I0835e2a76551057f3eea30a343e0373b642192f0
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

3 files changed, 58 insertions, 40 deletions

diff --git a/src/core/printing/print_view_manager_base_qt.cpp b/src/core/printing/print_view_manager_base_qt.cpp
index 4516f10b2..0cc334776 100644
--- a/src/core/printing/print_view_manager_base_qt.cpp
+++ b/src/core/printing/print_view_manager_base_qt.cpp
@@ -50,6 +50,7 @@
 #include "base/memory/ref_counted_memory.h"
 #include "base/memory/shared_memory.h"
 #include "base/message_loop/message_loop.h"
+#include "base/message_loop/message_loop_current.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/task/post_task.h"
@@ -150,7 +151,8 @@ printing::PrintedDocument *PrintViewManagerBaseQt::GetDocument(int cookie)
 
 // IPC handlers
 void PrintViewManagerBaseQt::OnDidPrintDocument(content::RenderFrameHost* /*render_frame_host*/,
-                                                const PrintHostMsg_DidPrintDocument_Params &params)
+                                                const PrintHostMsg_DidPrintDocument_Params &params,
+                                                std::unique_ptr<DelayedFrameDispatchHelper> helper)
 {
     printing::PrintedDocument *document = GetDocument(params.document_cookie);
     if (!document)
@@ -172,6 +174,21 @@ void PrintViewManagerBaseQt::OnDidPrintDocument(content::RenderFrameHost* /*rend
 
     PrintDocument(document, data, params.page_size, params.content_area,
                   params.physical_offsets);
+    if (helper)
+        helper->SendCompleted();
+}
+
+void PrintViewManagerBaseQt::OnGetDefaultPrintSettings(content::RenderFrameHost *render_frame_host,
+                                                       IPC::Message *reply_msg)
+{
+    NOTREACHED() << "should be handled by printing::PrintingMessageFilter";
+}
+
+void PrintViewManagerBaseQt::OnScriptedPrint(content::RenderFrameHost *render_frame_host,
+                                             const PrintHostMsg_ScriptedPrint_Params &params,
+                                             IPC::Message *reply_msg)
+{
+    NOTREACHED() << "should be handled by printing::PrintingMessageFilter";
 }
 
 void PrintViewManagerBaseQt::OnShowInvalidPrinterSettingsError()
@@ -212,13 +229,6 @@ bool PrintViewManagerBaseQt::OnMessageReceived(const IPC::Message& message,
                                                content::RenderFrameHost* render_frame_host)
 {
     bool handled = true;
-    IPC_BEGIN_MESSAGE_MAP_WITH_PARAM(PrintViewManagerBaseQt, message, render_frame_host)
-        IPC_MESSAGE_HANDLER(PrintHostMsg_DidPrintDocument, OnDidPrintDocument)
-        IPC_MESSAGE_UNHANDLED(handled = false)
-    IPC_END_MESSAGE_MAP()
-    if (handled)
-        return true;
-    handled = true;
     IPC_BEGIN_MESSAGE_MAP(PrintViewManagerBaseQt, message)
         IPC_MESSAGE_HANDLER(PrintHostMsg_ShowInvalidPrinterSettingsError,
                             OnShowInvalidPrinterSettingsError);
@@ -514,20 +524,21 @@ void PrintViewManagerBaseQt::ReleasePrinterQuery()
     printerQuery = m_printerQueriesQueue->PopPrinterQuery(cookie);
     if (!printerQuery)
         return;
-    base::PostTaskWithTraits(FROM_HERE, {content::BrowserThread::IO},
-                             base::BindOnce(&printing::PrinterQuery::StopWorker, std::move(printerQuery)));
+    base::PostTask(FROM_HERE, {content::BrowserThread::IO},
+                   base::BindOnce(&printing::PrinterQuery::StopWorker, std::move(printerQuery)));
 }
 
 // Originally from print_preview_message_handler.cc:
-void PrintViewManagerBaseQt::StopWorker(int documentCookie) {
-  if (documentCookie <= 0)
-    return;
-  std::unique_ptr<printing::PrinterQuery> printer_query =
-      m_printerQueriesQueue->PopPrinterQuery(documentCookie);
-  if (printer_query.get()) {
-    base::PostTaskWithTraits(FROM_HERE, {content::BrowserThread::IO},
-                            base::BindOnce(&printing::PrinterQuery::StopWorker, std::move(printer_query)));
-  }
+void PrintViewManagerBaseQt::StopWorker(int documentCookie)
+{
+    if (documentCookie <= 0)
+        return;
+    std::unique_ptr<printing::PrinterQuery> printer_query =
+            m_printerQueriesQueue->PopPrinterQuery(documentCookie);
+    if (printer_query.get()) {
+        base::PostTask(FROM_HERE, {content::BrowserThread::IO},
+                       base::BindOnce(&printing::PrinterQuery::StopWorker, std::move(printer_query)));
+    }
 }
 
 void PrintViewManagerBaseQt::SendPrintingEnabled(bool enabled, content::RenderFrameHost* rfh)
diff --git a/src/core/printing/print_view_manager_base_qt.h b/src/core/printing/print_view_manager_base_qt.h
index 31e0a1778..1217e8c11 100644
--- a/src/core/printing/print_view_manager_base_qt.h
+++ b/src/core/printing/print_view_manager_base_qt.h
@@ -98,9 +98,16 @@ protected:
     bool OnMessageReceived(const IPC::Message& message,
                            content::RenderFrameHost* render_frame_host) override;
 
-    // IPC Message handlers.
-    void OnDidPrintDocument(content::RenderFrameHost* render_frame_host,
-                            const PrintHostMsg_DidPrintDocument_Params& params);
+    // printing::PrintManager implementation:
+    void OnDidPrintDocument(content::RenderFrameHost *render_frame_host,
+                            const PrintHostMsg_DidPrintDocument_Params &params,
+                            std::unique_ptr<DelayedFrameDispatchHelper> helper) override;
+    void OnGetDefaultPrintSettings(content::RenderFrameHost* render_frame_host,
+                                   IPC::Message* reply_msg) override;
+    void OnScriptedPrint(content::RenderFrameHost* render_frame_host,
+                         const PrintHostMsg_ScriptedPrint_Params& params,
+                         IPC::Message* reply_msg) override;
+
     void OnShowInvalidPrinterSettingsError();
 
     // Processes a NOTIFY_PRINT_JOB_EVENT notification.
diff --git a/src/core/printing/print_view_manager_qt.cpp b/src/core/printing/print_view_manager_qt.cpp
index 7d8039100..4c82faee8 100644
--- a/src/core/printing/print_view_manager_qt.cpp
+++ b/src/core/printing/print_view_manager_qt.cpp
@@ -106,8 +106,8 @@ static void SavePdfFile(scoped_refptr<base::RefCountedBytes> data,
     base::File file(path,
                     base::File::FLAG_CREATE_ALWAYS | base::File::FLAG_WRITE);
     bool success = file.IsValid() && metafile.SaveTo(&file);
-    base::PostTaskWithTraits(FROM_HERE, {content::BrowserThread::UI},
-                             base::BindOnce(saveCallback, success));
+    base::PostTask(FROM_HERE, {content::BrowserThread::UI},
+                   base::BindOnce(saveCallback, success));
 }
 
 static base::DictionaryValue *createPrintSettings()
@@ -216,16 +216,16 @@ void PrintViewManagerQt::PrintToPDFFileWithCallback(const QPageLayout &pageLayou
         return;
 
     if (m_printSettings || !filePath.length()) {
-        base::PostTaskWithTraits(FROM_HERE, {content::BrowserThread::UI},
-                                 base::BindOnce(callback, false));
+        base::PostTask(FROM_HERE, {content::BrowserThread::UI},
+                       base::BindOnce(callback, false));
         return;
     }
 
     m_pdfOutputPath = toFilePath(filePath);
     m_pdfSaveCallback = callback;
     if (!PrintToPDFInternal(pageLayout, printInColor)) {
-        base::PostTaskWithTraits(FROM_HERE, {content::BrowserThread::UI},
-                                 base::BindOnce(callback, false));
+        base::PostTask(FROM_HERE, {content::BrowserThread::UI},
+                       base::BindOnce(callback, false));
         resetPdfState();
     }
 }
@@ -240,15 +240,15 @@ void PrintViewManagerQt::PrintToPDFWithCallback(const QPageLayout &pageLayout,
 
     // If there already is a pending print in progress, don't try starting another one.
     if (m_printSettings) {
-        base::PostTaskWithTraits(FROM_HERE, {content::BrowserThread::UI},
-                                base::BindOnce(callback, QSharedPointer<QByteArray>()));
+        base::PostTask(FROM_HERE, {content::BrowserThread::UI},
+                       base::BindOnce(callback, QSharedPointer<QByteArray>()));
         return;
     }
 
     m_pdfPrintCallback = callback;
     if (!PrintToPDFInternal(pageLayout, printInColor, useCustomMargins)) {
-        base::PostTaskWithTraits(FROM_HERE, {content::BrowserThread::UI},
-                                 base::BindOnce(callback, QSharedPointer<QByteArray>()));
+        base::PostTask(FROM_HERE, {content::BrowserThread::UI},
+                       base::BindOnce(callback, QSharedPointer<QByteArray>()));
 
         resetPdfState();
     }
@@ -359,12 +359,12 @@ void PrintViewManagerQt::OnMetafileReadyForPrinting(content::RenderFrameHost* rf
 
     if (!pdf_print_callback.is_null()) {
         QSharedPointer<QByteArray> data_array = GetStdVectorFromHandle(params.content.metafile_data_region);
-        base::PostTaskWithTraits(FROM_HERE, {content::BrowserThread::UI},
-                                 base::BindOnce(pdf_print_callback, data_array));
+        base::PostTask(FROM_HERE, {content::BrowserThread::UI},
+                       base::BindOnce(pdf_print_callback, data_array));
     } else {
         scoped_refptr<base::RefCountedBytes> data_bytes = GetBytesFromHandle(params.content.metafile_data_region);
-        base::PostTaskWithTraits(FROM_HERE, {base::MayBlock()},
-                                 base::BindOnce(&SavePdfFile, data_bytes, pdfOutputPath, pdf_save_callback));
+        base::PostTask(FROM_HERE, {base::ThreadPool(), base::MayBlock()},
+                       base::BindOnce(&SavePdfFile, data_bytes, pdfOutputPath, pdf_save_callback));
     }
 }
 
@@ -382,8 +382,8 @@ void PrintViewManagerQt::DidStartLoading()
 void PrintViewManagerQt::NavigationStopped()
 {
     if (!m_pdfPrintCallback.is_null()) {
-        base::PostTaskWithTraits(FROM_HERE, {content::BrowserThread::UI},
-                                 base::BindOnce(m_pdfPrintCallback, QSharedPointer<QByteArray>()));
+        base::PostTask(FROM_HERE, {content::BrowserThread::UI},
+                       base::BindOnce(m_pdfPrintCallback, QSharedPointer<QByteArray>()));
     }
     resetPdfState();
     PrintViewManagerBaseQt::NavigationStopped();
@@ -393,8 +393,8 @@ void PrintViewManagerQt::RenderProcessGone(base::TerminationStatus status)
 {
     PrintViewManagerBaseQt::RenderProcessGone(status);
     if (!m_pdfPrintCallback.is_null()) {
-        base::PostTaskWithTraits(FROM_HERE, {content::BrowserThread::UI},
-                                 base::BindOnce(m_pdfPrintCallback, QSharedPointer<QByteArray>()));
+        base::PostTask(FROM_HERE, {content::BrowserThread::UI},
+                       base::BindOnce(m_pdfPrintCallback, QSharedPointer<QByteArray>()));
     }
     resetPdfState();
 }