Chromium 81-based adaptations

Change-Id: Ie422b327025da084bc8038c7a0aadee2db801f29
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>

4 files changed, 6 insertions, 12 deletions

diff --git a/src/core/renderer/content_renderer_client_qt.cpp b/src/core/renderer/content_renderer_client_qt.cpp
index 428697936..4786a20ae 100644
--- a/src/core/renderer/content_renderer_client_qt.cpp
+++ b/src/core/renderer/content_renderer_client_qt.cpp
@@ -273,7 +273,8 @@ void ContentRendererClientQt::PrepareErrorPage(content::RenderFrame *renderFrame
 {
     GetNavigationErrorStringsInternal(
             renderFrame, httpMethod,
-            error_page::Error::NetError(web_error.url(), web_error.reason(), web_error.has_copy_in_cache()), errorHtml);
+            error_page::Error::NetError((GURL)web_error.url(), web_error.reason(), net::ResolveErrorInfo(), web_error.has_copy_in_cache()),
+            errorHtml);
 }
 
 void ContentRendererClientQt::PrepareErrorPageForHttpStatusError(content::RenderFrame *renderFrame,
@@ -306,8 +307,8 @@ void ContentRendererClientQt::GetNavigationErrorStringsInternal(content::RenderF
         error_page::LocalizedError::PageState errorPageState =
             error_page::LocalizedError::GetPageState(
                 error.reason(), error.domain(), error.url(), isPost,
-                error.stale_copy_in_cache(), false, RenderThreadObserverQt::is_incognito_process(), false,
-                false, locale, std::unique_ptr<error_page::ErrorPageParams>());
+                false, error.stale_copy_in_cache(), false, RenderThreadObserverQt::is_incognito_process(), false,
+                false, false, locale, std::unique_ptr<error_page::ErrorPageParams>());
 
         resourceId = IDR_NET_ERROR_HTML;
 
@@ -606,7 +607,7 @@ void ContentRendererClientQt::InitSpellCheck()
 void ContentRendererClientQt::WillSendRequest(blink::WebLocalFrame *frame,
                                               ui::PageTransition transition_type,
                                               const blink::WebURL &url,
-                                              const blink::WebURL &site_for_cookies,
+                                              const net::SiteForCookies &site_for_cookies,
                                               const url::Origin *initiator_origin,
                                               GURL *new_url,
                                               bool *attach_same_site_cookies)
diff --git a/src/core/renderer/content_renderer_client_qt.h b/src/core/renderer/content_renderer_client_qt.h
index f2e725453..3cbd5b9ee 100644
--- a/src/core/renderer/content_renderer_client_qt.h
+++ b/src/core/renderer/content_renderer_client_qt.h
@@ -122,7 +122,7 @@ public:
     void WillSendRequest(blink::WebLocalFrame *frame,
                          ui::PageTransition transition_type,
                          const blink::WebURL &url,
-                         const blink::WebURL &site_for_cookies,
+                         const net::SiteForCookies &site_for_cookies,
                          const url::Origin *initiator_origin,
                          GURL *new_url,
                          bool *attach_same_site_cookies) override;
diff --git a/src/core/renderer/print_web_view_helper_delegate_qt.cpp b/src/core/renderer/print_web_view_helper_delegate_qt.cpp
index b85ff7249..beae6ecfa 100644
--- a/src/core/renderer/print_web_view_helper_delegate_qt.cpp
+++ b/src/core/renderer/print_web_view_helper_delegate_qt.cpp
@@ -54,11 +54,6 @@
 namespace QtWebEngineCore {
 PrintWebViewHelperDelegateQt::~PrintWebViewHelperDelegateQt() {}
 
-bool PrintWebViewHelperDelegateQt::CancelPrerender(content::RenderFrame *)
-{
-    return false;
-}
-
 blink::WebElement PrintWebViewHelperDelegateQt::GetPdfElement(blink::WebLocalFrame *frame)
 {
     GURL url = frame->GetDocument().Url();
diff --git a/src/core/renderer/print_web_view_helper_delegate_qt.h b/src/core/renderer/print_web_view_helper_delegate_qt.h
index f02580b91..2cbc171a6 100644
--- a/src/core/renderer/print_web_view_helper_delegate_qt.h
+++ b/src/core/renderer/print_web_view_helper_delegate_qt.h
@@ -57,8 +57,6 @@ class PrintWebViewHelperDelegateQt : public printing::PrintRenderFrameHelper::De
 public:
     ~PrintWebViewHelperDelegateQt() override;
 
-    bool CancelPrerender(content::RenderFrame *render_frame) override;
-
     blink::WebElement GetPdfElement(blink::WebLocalFrame *frame) override;
 
     bool IsPrintPreviewEnabled() override;