Suppress error pages also for http errors if they are disabled

Load with client or server http error results in successful navigation,
which leads to 'true' loadFinished result, and subsequent chromium's error
page load and display with second set of loadStarted/loadFinished signals.
This effectively ignores QWebEngineSettings::ErrorPageEnabled. Fixing it
requires submodule change to ask embedder if error pages should also be
suppressed for http errors.

Also update chromium for required change, which pulls in the following changes:

* e71010069b4  Fix embedded builds with printing enabled
* f5a93d251cc  Allow the embedder to suppress an error page for http errors

Change-Id: I731678575439a6dad90dfb89e79b0083c63b49c2
Reviewed-by: Allan Sandfeld Jensen <[email protected]>

Author: Kirill Burtsev

src/core/web_contents_delegate_qt.cpp

@@ -373,8 +373,6 @@ void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *naviga
     if (!navigation_handle->IsInMainFrame())
         return;
 
-    // Error-pages are not reported as separate started navigations.
-    Q_ASSERT(!navigation_handle->IsErrorPage());
 
     m_loadingErrorFrameList.clear();
     m_faviconManager->resetCandidates();
@@ -383,6 +381,8 @@ void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *naviga
 
 void WebContentsDelegateQt::EmitLoadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription)
 {
+    Q_ASSERT(!isErrorPage || webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled));
+
     // When error page enabled we don't need to send the error page load finished signal
     if (m_loadProgressMap[url] == 100)
         return;
@@ -537,10 +537,8 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame
         m_viewClient->iconChanged(QUrl());
 
     content::NavigationEntry *entry = web_contents()->GetController().GetActiveEntry();
-    int http_statuscode = 0;
-    if (entry)
-       http_statuscode = entry->GetHttpStatusCode();
-    EmitLoadFinished(true /* success */ , toQt(validated_url), false /* isErrorPage */, http_statuscode);
+    int http_statuscode = entry ? http_statuscode = entry->GetHttpStatusCode() : 0;
+    EmitLoadFinished(http_statuscode < 400, toQt(validated_url), false /* isErrorPage */, http_statuscode);
 }
 
 void WebContentsDelegateQt::DidUpdateFaviconURL(const std::vector<blink::mojom::FaviconURLPtr> &candidates)

src/webenginewidgets/api/qwebenginepage.cpp

@@ -290,7 +290,6 @@ void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isE
     Q_UNUSED(errorDescription);
 
     if (isErrorPage) {
-        Q_ASSERT(settings->testAttribute(QWebEngineSettings::ErrorPageEnabled));
         QTimer::singleShot(0, q, [q](){
             emit q->loadFinished(false);
         });

tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp

@@ -174,6 +174,7 @@ private Q_SLOTS:
     void setUrlUsingStateObject();
     void setUrlThenLoads_data();
     void setUrlThenLoads();
+    void loadFinishedAfterNotFoundError_data();
     void loadFinishedAfterNotFoundError();
     void loadInSignalHandlers_data();
     void loadInSignalHandlers();
@@ -2820,18 +2821,49 @@ void tst_QWebEnginePage::setUrlThenLoads()
     QCOMPARE(baseUrlSync(m_page), extractBaseUrl(urlToLoad2));
 }
 
+void tst_QWebEnginePage::loadFinishedAfterNotFoundError_data()
+{
+    QTest::addColumn<bool>("rfcInvalid");
+    QTest::addColumn<bool>("withServer");
+    QTest::addRow("rfc_invalid")  << true  << false;
+    QTest::addRow("non_existent") << false << false;
+    QTest::addRow("server_404")   << false << true;
+}
+
 void tst_QWebEnginePage::loadFinishedAfterNotFoundError()
 {
+    QFETCH(bool, withServer);
+    QFETCH(bool, rfcInvalid);
+
+    QScopedPointer<HttpServer> server;
+    if (withServer) {
+        server.reset(new HttpServer);
+        QVERIFY(server->start());
+    }
+
     QWebEnginePage page;
     QSignalSpy spy(&page, SIGNAL(loadFinished(bool)));
 
     page.settings()->setAttribute(QWebEngineSettings::ErrorPageEnabled, false);
-    page.setUrl(QUrl("http://non.existent/url"));
+    auto url = server
+        ? server->url("/not-found-page.html")
+        : QUrl(rfcInvalid ? "http://some.invalid" : "http://non.existent/url");
+    page.setUrl(url);
     QTRY_COMPARE_WITH_TIMEOUT(spy.count(), 1, 20000);
+    QVERIFY(!spy.at(0).at(0).toBool());
+    QCOMPARE(toPlainTextSync(&page), QString());
+    QCOMPARE(spy.count(), 1);
 
     page.settings()->setAttribute(QWebEngineSettings::ErrorPageEnabled, true);
-    page.setUrl(QUrl("http://another.non.existent/url"));
+    url = server
+        ? server->url("/another-missing-one.html")
+        : QUrl(rfcInvalid ? "http://some.other.invalid" : "http://another.non.existent/url");
+    page.setUrl(url);
     QTRY_COMPARE_WITH_TIMEOUT(spy.count(), 2, 20000);
+    QVERIFY(!spy.at(1).at(0).toBool());
+
+    QEXPECT_FAIL("", "No more loads (like separate load for error pages) are expected", Continue);
+    QTRY_COMPARE_WITH_TIMEOUT(spy.count(), 3, 1000);
 }
 
 class URLSetter : public QObject {