Adaptations for Chromium 79

Fixes: QTBUG-80737
Fixes: QTBUG-81556
Fixes: QTBUG-81614
Change-Id: Ie6a69cdbf46d0508bff226f1b8fed28a618e1949
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

6 files changed, 108 insertions, 115 deletions

diff --git a/tests/auto/quick/qmltests/data/test4.html b/tests/auto/quick/qmltests/data/test4.html
index afda71bc5..c9b395ee5 100644
--- a/tests/auto/quick/qmltests/data/test4.html
+++ b/tests/auto/quick/qmltests/data/test4.html
@@ -24,106 +24,106 @@
             }
         </script>
         <div id="content">
-            bla00<br/>
-            bla01<br/>
-            bla02<br/>
-            bla03<br/>
-            bla04<br/>
-            bla05<br/>
-            bla06<br/>
-            bla07<br/>
-            bla08<br/>
-            bla09<br/>
-            bla10<br/>
-            bla11<br/>
-            bla12<br/>
-            bla13<br/>
-            bla14<br/>
-            bla15<br/>
-            bla16<br/>
-            bla17<br/>
-            bla18<br/>
-            bla19<br/>
-            bla20<br/>
-            bla21<br/>
-            bla22<br/>
-            bla23<br/>
-            bla24<br/>
-            bla25<br/>
-            bla26<br/>
-            bla27<br/>
-            bla28<br/>
-            bla29<br/>
-            bla30<br/>
-            bla31<br/>
-            bla32<br/>
-            bla33<br/>
-            bla34<br/>
-            bla35<br/>
-            bla36<br/>
-            bla37<br/>
-            bla38<br/>
-            bla39<br/>
-            bla40<br/>
-            bla41<br/>
-            bla42<br/>
-            bla43<br/>
-            bla44<br/>
-            bla45<br/>
-            bla46<br/>
-            bla47<br/>
-            bla48<br/>
-            bla49<br/>
-            bla50<br/>
-            bla51<br/>
-            bla52<br/>
-            bla53<br/>
-            bla54<br/>
-            bla55<br/>
-            bla56<br/>
-            bla57<br/>
-            bla58<br/>
-            bla59<br/>
-            bla60<br/>
-            bla61<br/>
-            bla62<br/>
-            bla63<br/>
-            bla64<br/>
-            bla65<br/>
-            bla66<br/>
-            bla67<br/>
-            bla68<br/>
-            bla69<br/>
-            bla70<br/>
-            bla71<br/>
-            bla72<br/>
-            bla73<br/>
-            bla74<br/>
-            bla75<br/>
-            bla76<br/>
-            bla77<br/>
-            bla78<br/>
-            bla79<br/>
-            bla80<br/>
-            bla81<br/>
-            bla82<br/>
-            bla83<br/>
-            bla84<br/>
-            bla85<br/>
-            bla86<br/>
-            bla87<br/>
-            bla88<br/>
-            bla89<br/>
-            bla90<br/>
-            bla91<br/>
-            bla92<br/>
-            bla93<br/>
-            bla94<br/>
-            bla95<br/>
-            bla96<br/>
-            bla97<br/>
-            bla98<br/>
-            bla99<br/>
+            <p>bla00
+            <p>bla01
+            <p>bla02
+            <p>bla03
+            <p>bla04
+            <p>bla05
+            <p>bla06
+            <p>bla07
+            <p>bla08
+            <p>bla09
+            <p>bla10
+            <p>bla11
+            <p>bla12
+            <p>bla13
+            <p>bla14
+            <p>bla15
+            <p>bla16
+            <p>bla17
+            <p>bla18
+            <p>bla19
+            <p>bla20
+            <p>bla21
+            <p>bla22
+            <p>bla23
+            <p>bla24
+            <p>bla25
+            <p>bla26
+            <p>bla27
+            <p>bla28
+            <p>bla29
+            <p>bla30
+            <p>bla31
+            <p>bla32
+            <p>bla33
+            <p>bla34
+            <p>bla35
+            <p>bla36
+            <p>bla37
+            <p>bla38
+            <p>bla39
+            <p>bla40
+            <p>bla41
+            <p>bla42
+            <p>bla43
+            <p>bla44
+            <p>bla45
+            <p>bla46
+            <p>bla47
+            <p>bla48
+            <p>bla49
+            <p>bla50
+            <p>bla51
+            <p>bla52
+            <p>bla53
+            <p>bla54
+            <p>bla55
+            <p>bla56
+            <p>bla57
+            <p>bla58
+            <p>bla59
+            <p>bla60
+            <p>bla61
+            <p>bla62
+            <p>bla63
+            <p>bla64
+            <p>bla65
+            <p>bla66
+            <p>bla67
+            <p>bla68
+            <p>bla69
+            <p>bla70
+            <p>bla71
+            <p>bla72
+            <p>bla73
+            <p>bla74
+            <p>bla75
+            <p>bla76
+            <p>bla77
+            <p>bla78
+            <p>bla79
+            <p>bla80
+            <p>bla81
+            <p>bla82
+            <p>bla83
+            <p>bla84
+            <p>bla85
+            <p>bla86
+            <p>bla87
+            <p>bla88
+            <p>bla89
+            <p>bla90
+            <p>bla91
+            <p>bla92
+            <p>bla93
+            <p>bla94
+            <p>bla95
+            <p>bla96
+            <p>bla97
+            <p>bla98
+            <p>bla99
         </div>
     </body>
 </html>
diff --git a/tests/auto/quick/qmltests/data/tst_loadUrl.qml b/tests/auto/quick/qmltests/data/tst_loadUrl.qml
index 7bdd0c761..872c46641 100644
--- a/tests/auto/quick/qmltests/data/tst_loadUrl.qml
+++ b/tests/auto/quick/qmltests/data/tst_loadUrl.qml
@@ -230,7 +230,7 @@ TestWebEngineView {
             compare(loadRequest.activeUrl, aboutBlank);
             loadRequest = loadRequestArray[2];
             compare(loadRequest.status, WebEngineView.LoadStartedStatus);
-            compare(loadRequest.activeUrl, "data:text/html;charset=UTF-8,load failed");
+            compare(loadRequest.activeUrl, bogusSite);
             compare(loadRequest.url, "data:text/html;charset=UTF-8,load failed")
             loadRequest = loadRequestArray[3];
             compare(loadRequest.status, WebEngineView.LoadSucceededStatus);
diff --git a/tests/auto/widgets/accessibility/tst_accessibility.cpp b/tests/auto/widgets/accessibility/tst_accessibility.cpp
index 5f472332f..80defb248 100644
--- a/tests/auto/widgets/accessibility/tst_accessibility.cpp
+++ b/tests/auto/widgets/accessibility/tst_accessibility.cpp
@@ -344,7 +344,7 @@ void tst_Accessibility::roles_data()
     QTest::newRow("AX_ROLE_APPLICATION") << QString("<div role='application'>landmark</div>") << true << QAccessible::Document;
     QTest::newRow("AX_ROLE_ARTICLE") << QString("<article>a</article>") << true << QAccessible::Section;
     QTest::newRow("AX_ROLE_AUDIO") << QString("<audio controls><source src='test.mp3' type='audio/mpeg'></audio>") << false << QAccessible::Sound;
-    QTest::newRow("AX_ROLE_BANNER") << QString("<header>a</header>") << true << QAccessible::Section;
+    QTest::newRow("AX_ROLE_BANNER") << QString("<div role=banner>a</div>") << true << QAccessible::Section;
     QTest::newRow("AX_ROLE_BLOCKQUOTE") << QString("<blockquote>a</blockquote>") << true << QAccessible::Section;
     QTest::newRow("AX_ROLE_BUTTON") << QString("<button>a</button>") << false << QAccessible::Button;
     //QTest::newRow("AX_ROLE_BUTTON_DROP_DOWN"); // TODO: Remove this during the next Chromium update: https://chromium-review.googlesource.com/842475
@@ -383,6 +383,7 @@ void tst_Accessibility::roles_data()
     QTest::newRow("AX_ROLE_FORM") << QString("<form></form>") << true << QAccessible::Form;
     QTest::newRow("AX_ROLE_GRID") << QString("<div role='grid'></div>") << true << QAccessible::Table;
     QTest::newRow("AX_ROLE_GROUP") << QString("<fieldset></fieldset>") << true << QAccessible::Grouping;
+    QTest::newRow("AX_ROLE_HEADER)") << QString("<header>a</header>") << true << QAccessible::Section;
     QTest::newRow("AX_ROLE_HEADING") << QString("<h1>a</h1>") << true << QAccessible::Heading;
     QTest::newRow("AX_ROLE_IFRAME") << QString("<iframe>a</iframe>") << true << QAccessible::Section;
     QTest::newRow("AX_ROLE_IFRAME_PRESENTATIONAL") << QString("<iframe role='presentation'>a</iframe>") << false << QAccessible::NoRole;
diff --git a/tests/auto/widgets/origins/BLACKLIST b/tests/auto/widgets/origins/BLACKLIST
deleted file mode 100644
index db858f11e..000000000
--- a/tests/auto/widgets/origins/BLACKLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-# QTBUG-81556
-[mixedXHR]
-*
diff --git a/tests/auto/widgets/qwebenginepage/BLACKLIST b/tests/auto/widgets/qwebenginepage/BLACKLIST
index 3053876d4..02b297d5a 100644
--- a/tests/auto/widgets/qwebenginepage/BLACKLIST
+++ b/tests/auto/widgets/qwebenginepage/BLACKLIST
@@ -5,10 +5,6 @@ osx
 windows
 macos # Can't move cursor (QTBUG-76312)
 
-# QTBUG-81614
-[setHtmlWithBaseURL]
-*
-
 [devTools]
 msvc-2019
 
diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
index f500652c7..10ad34a9e 100644
--- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
+++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
@@ -799,7 +799,7 @@ void tst_QWebEnginePage::backActionUpdate()
     };
 
     QVERIFY(evaluateJavaScriptSync(page, "document.getElementsByName('frame_b')[0].contentDocument == undefined").toBool());
-    QTest::mouseClick(view.focusProxy(), Qt::LeftButton, 0, firstAnchorCenterInFrame(page, "frame_c"));
+    QTest::mouseClick(view.focusProxy(), Qt::LeftButton, {}, firstAnchorCenterInFrame(page, "frame_c"));
     QTRY_VERIFY(evaluateJavaScriptSync(page, "document.getElementsByName('frame_b')[0].contentDocument != undefined").toBool());
     QTRY_VERIFY(action->isEnabled());
 }
@@ -1964,8 +1964,7 @@ void tst_QWebEnginePage::urlChange()
     QUrl testUrl("http://test.qt.io/");
     m_view->setHtml(QStringLiteral("<h1>Test</h1"), testUrl);
 
-    QTRY_COMPARE(urlSpy.size(), 2);
-    QCOMPARE(urlSpy.takeFirst().value(0).toUrl(), QUrl("data:text/html;charset=UTF-8,%3Ch1%3ETest%3C%2Fh1"));
+    QTRY_COMPARE(urlSpy.size(), 1);
     QCOMPARE(urlSpy.takeFirst().value(0).toUrl(), testUrl);
 }
 
@@ -2077,7 +2076,7 @@ void tst_QWebEnginePage::requestedUrlAfterSetAndLoadFailures()
 
     page.load(second);
     QTRY_COMPARE_WITH_TIMEOUT(spy.count(), 2, 20000);
-    QCOMPARE(page.url(), second);
+    QCOMPARE(page.url(), first);
     QCOMPARE(page.requestedUrl(), second);
     QVERIFY(!spy.at(1).first().toBool());
 }
@@ -2777,8 +2776,8 @@ void tst_QWebEnginePage::setUrlThenLoads()
     QCOMPARE(baseUrlSync(m_page), extractBaseUrl(urlToLoad1));
 
     m_page->load(urlToLoad2);
-    QTRY_COMPARE(m_page->url(), urlToLoad2);
-    QTRY_COMPARE(m_page->requestedUrl(), urlToLoad2);
+    QCOMPARE(m_page->url(), urlToLoad1);
+    QCOMPARE(m_page->requestedUrl(), urlToLoad2);
     QCOMPARE(baseUrlSync(m_page), extractBaseUrl(urlToLoad1));
     QTRY_COMPARE(startedSpy.count(), 3);