Remove QWebEngineCallback

Was no longer used in exposed APIs

Fixes: QTBUG-74588
Change-Id: Iaf4943983655fc79e67df28f5cd4c4961b360579
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
(cherry picked from commit c4d794898394d7d0f79001a04c8cff50dbc4fba7)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

2 files changed, 12 insertions, 44 deletions

diff --git a/src/core/net/cookie_monster_delegate_qt.cpp b/src/core/net/cookie_monster_delegate_qt.cpp
index 9f703bcbc..2fbacd73b 100644
--- a/src/core/net/cookie_monster_delegate_qt.cpp
+++ b/src/core/net/cookie_monster_delegate_qt.cpp
@@ -125,23 +125,19 @@ bool CookieMonsterDelegateQt::hasCookieMonster()
     return m_mojoCookieManager.is_bound();
 }
 
-void CookieMonsterDelegateQt::getAllCookies(quint64 callbackId)
+void CookieMonsterDelegateQt::getAllCookies()
 {
-    m_mojoCookieManager->GetAllCookies(base::BindOnce(&CookieMonsterDelegateQt::GetAllCookiesCallbackOnUIThread, this, callbackId));
+    m_mojoCookieManager->GetAllCookies(net::CookieStore::GetAllCookiesCallback());
 }
 
-void CookieMonsterDelegateQt::setCookie(quint64 callbackId, const QNetworkCookie &cookie, const QUrl &origin)
+void CookieMonsterDelegateQt::setCookie(const QNetworkCookie &cookie, const QUrl &origin)
 {
     Q_ASSERT(hasCookieMonster());
     Q_ASSERT(m_client);
 
-    net::CookieStore::SetCookiesCallback callback;
-
     GURL gurl = origin.isEmpty() ? sourceUrlForCookie(cookie) : toGurl(origin);
     std::string cookie_line = cookie.toRawForm().toStdString();
 
-    if (callbackId != CallbackDirectory::NoCallbackId)
-        callback = base::BindOnce(&CookieMonsterDelegateQt::SetCookieCallbackOnUIThread, this, callbackId);
     net::CookieInclusionStatus inclusion;
     auto canonCookie = net::CanonicalCookie::Create(gurl, cookie_line, base::Time::Now(), base::nullopt, &inclusion);
     if (!inclusion.IsInclude()) {
@@ -151,7 +147,7 @@ void CookieMonsterDelegateQt::setCookie(quint64 callbackId, const QNetworkCookie
     net::CookieOptions options;
     options.set_include_httponly();
     options.set_same_site_cookie_context(net::CookieOptions::SameSiteCookieContext::MakeInclusiveForSet());
-    m_mojoCookieManager->SetCanonicalCookie(*canonCookie.get(), gurl, options, std::move(callback));
+    m_mojoCookieManager->SetCanonicalCookie(*canonCookie.get(), gurl, options, net::CookieStore::SetCookiesCallback());
 }
 
 void CookieMonsterDelegateQt::deleteCookie(const QNetworkCookie &cookie, const QUrl &origin)
@@ -167,27 +163,23 @@ void CookieMonsterDelegateQt::deleteCookie(const QNetworkCookie &cookie, const Q
     m_mojoCookieManager->DeleteCookies(std::move(filter), network::mojom::CookieManager::DeleteCookiesCallback());
 }
 
-void CookieMonsterDelegateQt::deleteSessionCookies(quint64 callbackId)
+void CookieMonsterDelegateQt::deleteSessionCookies()
 {
     Q_ASSERT(hasCookieMonster());
     Q_ASSERT(m_client);
 
-    network::mojom::CookieManager::DeleteCookiesCallback callback =
-        base::BindOnce(&CookieMonsterDelegateQt::DeleteCookiesCallbackOnUIThread, this, callbackId);
     auto filter = network::mojom::CookieDeletionFilter::New();
     filter->session_control = network::mojom::CookieDeletionSessionControl::SESSION_COOKIES;
-    m_mojoCookieManager->DeleteCookies(std::move(filter), std::move(callback));
+    m_mojoCookieManager->DeleteCookies(std::move(filter), network::mojom::CookieManager::DeleteCookiesCallback());
 }
 
-void CookieMonsterDelegateQt::deleteAllCookies(quint64 callbackId)
+void CookieMonsterDelegateQt::deleteAllCookies()
 {
     Q_ASSERT(hasCookieMonster());
     Q_ASSERT(m_client);
 
-    network::mojom::CookieManager::DeleteCookiesCallback callback =
-        base::BindOnce(&CookieMonsterDelegateQt::DeleteCookiesCallbackOnUIThread, this, callbackId);
     auto filter = network::mojom::CookieDeletionFilter::New();
-    m_mojoCookieManager->DeleteCookies(std::move(filter), std::move(callback));
+    m_mojoCookieManager->DeleteCookies(std::move(filter), network::mojom::CookieManager::DeleteCookiesCallback());
 }
 
 void CookieMonsterDelegateQt::setMojoCookieManager(network::mojom::CookieManagerPtrInfo cookie_manager_info)
@@ -265,23 +257,4 @@ void CookieMonsterDelegateQt::OnCookieChanged(const net::CookieChangeInfo &chang
     m_client->d_func()->onCookieChanged(toQt(change.cookie), change.cause != net::CookieChangeCause::INSERTED);
 }
 
-void CookieMonsterDelegateQt::GetAllCookiesCallbackOnUIThread(qint64 callbackId, const net::CookieList &cookies)
-{
-    QByteArray rawCookies = QByteArray::fromStdString(net::CanonicalCookie::BuildCookieLine(cookies));
-    if (m_client)
-        m_client->d_func()->onGetAllCallbackResult(callbackId, rawCookies);
-}
-
-void CookieMonsterDelegateQt::SetCookieCallbackOnUIThread(qint64 callbackId, net::CookieAccessResult status)
-{
-    if (m_client)
-        m_client->d_func()->onSetCallbackResult(callbackId, status.status.IsInclude());
-}
-
-void CookieMonsterDelegateQt::DeleteCookiesCallbackOnUIThread(qint64 callbackId, uint numCookies)
-{
-    if (m_client)
-        m_client->d_func()->onDeleteCallbackResult(callbackId, numCookies);
-}
-
 } // namespace QtWebEngineCore
diff --git a/src/core/net/cookie_monster_delegate_qt.h b/src/core/net/cookie_monster_delegate_qt.h
index 9078bcd58..4359119f9 100644
--- a/src/core/net/cookie_monster_delegate_qt.h
+++ b/src/core/net/cookie_monster_delegate_qt.h
@@ -95,11 +95,11 @@ public:
 
     bool hasCookieMonster();
 
-    void setCookie(quint64 callbackId, const QNetworkCookie &cookie, const QUrl &origin);
+    void setCookie(const QNetworkCookie &cookie, const QUrl &origin);
     void deleteCookie(const QNetworkCookie &cookie, const QUrl &origin);
-    void getAllCookies(quint64 callbackId);
-    void deleteSessionCookies(quint64 callbackId);
-    void deleteAllCookies(quint64 callbackId);
+    void getAllCookies();
+    void deleteSessionCookies();
+    void deleteAllCookies();
 
     void setClient(QWebEngineCookieStore *client);
     void setMojoCookieManager(network::mojom::CookieManagerPtrInfo cookie_manager_info);
@@ -111,11 +111,6 @@ public:
 
     void AddStore(net::CookieStore *store);
     void OnCookieChanged(const net::CookieChangeInfo &change);
-
-private:
-    void GetAllCookiesCallbackOnUIThread(qint64 callbackId, const net::CookieList &cookies);
-    void SetCookieCallbackOnUIThread(qint64 callbackId, net::CookieAccessResult status);
-    void DeleteCookiesCallbackOnUIThread(qint64 callbackId, uint numCookies);
 };
 
 }