1 files changed, 19 insertions, 162 deletions

diff --git a/src/core/net/cookie_monster_delegate_qt.cpp b/src/core/net/cookie_monster_delegate_qt.cpp
index e0fa60be7..dba79b4db 100644
--- a/src/core/net/cookie_monster_delegate_qt.cpp
+++ b/src/core/net/cookie_monster_delegate_qt.cpp
@@ -81,7 +81,6 @@ static GURL sourceUrlForCookie(const QNetworkCookie &cookie)
 
 CookieMonsterDelegateQt::CookieMonsterDelegateQt()
     : m_client(0)
-    , m_cookieMonster(nullptr)
     , m_listener(new CookieChangeListener(this))
     , m_binding(m_listener.get())
 {
@@ -104,26 +103,12 @@ void CookieMonsterDelegateQt::AddStore(net::CookieStore *store)
 
 bool CookieMonsterDelegateQt::hasCookieMonster()
 {
-    return m_cookieMonster || m_mojoCookieManager.is_bound();
+    return m_mojoCookieManager.is_bound();
 }
 
 void CookieMonsterDelegateQt::getAllCookies(quint64 callbackId)
 {
-    if (m_mojoCookieManager.is_bound()) {
-        m_mojoCookieManager->GetAllCookies(base::BindOnce(&CookieMonsterDelegateQt::GetAllCookiesCallbackOnUIThread, this, callbackId));
-    } else {
-        net::CookieMonster::GetCookieListCallback callback =
-            base::BindOnce(&CookieMonsterDelegateQt::GetAllCookiesCallbackOnIOThread, this, callbackId);
-        base::PostTaskWithTraits(FROM_HERE, {content::BrowserThread::IO},
-                                 base::BindOnce(&CookieMonsterDelegateQt::GetAllCookiesOnIOThread, this, std::move(callback)));
-    }
-}
-
-void CookieMonsterDelegateQt::GetAllCookiesOnIOThread(net::CookieMonster::GetCookieListCallback callback)
-{
-    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-    if (m_cookieMonster)
-        m_cookieMonster->GetAllCookiesAsync(std::move(callback));
+    m_mojoCookieManager->GetAllCookies(base::BindOnce(&CookieMonsterDelegateQt::GetAllCookiesCallbackOnUIThread, this, callbackId));
 }
 
 void CookieMonsterDelegateQt::setCookie(quint64 callbackId, const QNetworkCookie &cookie, const QUrl &origin)
@@ -136,31 +121,12 @@ void CookieMonsterDelegateQt::setCookie(quint64 callbackId, const QNetworkCookie
     GURL gurl = origin.isEmpty() ? sourceUrlForCookie(cookie) : toGurl(origin);
     std::string cookie_line = cookie.toRawForm().toStdString();
 
-    if (m_mojoCookieManager.is_bound()) {
-        if (callbackId != CallbackDirectory::NoCallbackId)
-            callback = base::BindOnce(&CookieMonsterDelegateQt::SetCookieCallbackOnUIThread, this, callbackId);
-        net::CookieOptions options;
-        options.set_include_httponly();
-        auto cookie = net::CanonicalCookie::Create(gurl, cookie_line, base::Time::Now(), options);
-        m_mojoCookieManager->SetCanonicalCookie(*cookie.get(), gurl.scheme(), options, std::move(callback));
-    } else {
-        if (callbackId != CallbackDirectory::NoCallbackId)
-            callback = base::BindOnce(&CookieMonsterDelegateQt::SetCookieCallbackOnIOThread, this, callbackId);
-        base::PostTaskWithTraits(FROM_HERE, {content::BrowserThread::IO},
-                                 base::BindOnce(&CookieMonsterDelegateQt::SetCookieOnIOThread, this,
-                                                gurl, std::move(cookie_line), std::move(callback)));
-    }
-}
-
-void CookieMonsterDelegateQt::SetCookieOnIOThread(const GURL &url, const std::string &cookie_line,
-                                                  net::CookieMonster::SetCookiesCallback callback)
-{
-    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
+    if (callbackId != CallbackDirectory::NoCallbackId)
+        callback = base::BindOnce(&CookieMonsterDelegateQt::SetCookieCallbackOnUIThread, this, callbackId);
     net::CookieOptions options;
     options.set_include_httponly();
-
-    if (m_cookieMonster)
-        m_cookieMonster->SetCookieWithOptionsAsync(url, cookie_line, options, std::move(callback));
+    auto canonCookie = net::CanonicalCookie::Create(gurl, cookie_line, base::Time::Now(), options);
+    m_mojoCookieManager->SetCanonicalCookie(*canonCookie.get(), gurl.scheme(), options, std::move(callback));
 }
 
 void CookieMonsterDelegateQt::deleteCookie(const QNetworkCookie &cookie, const QUrl &origin)
@@ -170,69 +136,22 @@ void CookieMonsterDelegateQt::deleteCookie(const QNetworkCookie &cookie, const Q
 
     GURL gurl = origin.isEmpty() ? sourceUrlForCookie(cookie) : toGurl(origin);
     std::string cookie_name = cookie.name().toStdString();
-    if (m_mojoCookieManager.is_bound()) {
-        auto filter = network::mojom::CookieDeletionFilter::New();
-        filter->url = gurl;
-        filter->cookie_name = cookie_name;
-        m_mojoCookieManager->DeleteCookies(std::move(filter), network::mojom::CookieManager::DeleteCookiesCallback());
-    } else {
-        base::PostTaskWithTraits(FROM_HERE, {content::BrowserThread::IO},
-                                 base::BindOnce(&CookieMonsterDelegateQt::DeleteCookieOnIOThread, this,
-                                                gurl, cookie_name));
-    }
-}
-
-void CookieMonsterDelegateQt::DeleteCookieOnIOThread(const GURL &url, const std::string &cookie_name)
-{
-    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-    if (m_cookieMonster) {
-        net::CookieMonster::GetCookieListCallback callback =
-            base::BindOnce(&CookieMonsterDelegateQt::GetCookiesToDeleteCallback, this, cookie_name);
-        m_cookieMonster->GetAllCookiesForURLAsync(url, std::move(callback));
-    }
+    auto filter = network::mojom::CookieDeletionFilter::New();
+    filter->url = gurl;
+    filter->cookie_name = cookie_name;
+    m_mojoCookieManager->DeleteCookies(std::move(filter), network::mojom::CookieManager::DeleteCookiesCallback());
 }
 
-void CookieMonsterDelegateQt::GetCookiesToDeleteCallback(const std::string &cookie_name, const net::CookieList &cookies,
-                                                         const net::CookieStatusList &statusList)
-{
-    Q_UNUSED(statusList);
-    if (!m_cookieMonster)
-        return;
-
-    net::CookieList cookiesToDelete;
-    for (auto cookie : cookies) {
-        if (cookie.Name() == cookie_name)
-            cookiesToDelete.push_back(cookie);
-    }
-    for (auto cookie : cookiesToDelete)
-        m_cookieMonster->DeleteCanonicalCookieAsync(cookie, base::DoNothing());
-}
-
-
 void CookieMonsterDelegateQt::deleteSessionCookies(quint64 callbackId)
 {
     Q_ASSERT(hasCookieMonster());
     Q_ASSERT(m_client);
 
-    if (m_mojoCookieManager.is_bound()) {
-        net::CookieMonster::DeleteCallback 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));
-    } else {
-        net::CookieMonster::DeleteCallback callback =
-            base::BindOnce(&CookieMonsterDelegateQt::DeleteCookiesCallbackOnIOThread, this, callbackId);
-        base::PostTaskWithTraits(FROM_HERE, {content::BrowserThread::IO},
-                                 base::BindOnce(&CookieMonsterDelegateQt::DeleteSessionCookiesOnIOThread, this, std::move(callback)));
-    }
-}
-
-void CookieMonsterDelegateQt::DeleteSessionCookiesOnIOThread(net::CookieMonster::DeleteCallback callback)
-{
-    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-    if (m_cookieMonster)
-        m_cookieMonster->DeleteSessionCookiesAsync(std::move(callback));
+    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));
 }
 
 void CookieMonsterDelegateQt::deleteAllCookies(quint64 callbackId)
@@ -240,44 +159,10 @@ void CookieMonsterDelegateQt::deleteAllCookies(quint64 callbackId)
     Q_ASSERT(hasCookieMonster());
     Q_ASSERT(m_client);
 
-    if (m_mojoCookieManager.is_bound()) {
-        net::CookieMonster::DeleteCallback callback =
-            base::BindOnce(&CookieMonsterDelegateQt::DeleteCookiesCallbackOnUIThread, this, callbackId);
-        auto filter = network::mojom::CookieDeletionFilter::New();
-        m_mojoCookieManager->DeleteCookies(std::move(filter), std::move(callback));
-    } else {
-        net::CookieMonster::DeleteCallback callback =
-            base::BindOnce(&CookieMonsterDelegateQt::DeleteCookiesCallbackOnIOThread, this, callbackId);
-        base::PostTaskWithTraits(FROM_HERE, {content::BrowserThread::IO},
-                                 base::BindOnce(&CookieMonsterDelegateQt::DeleteAllOnIOThread, this, std::move(callback)));
-    }
-}
-
-void CookieMonsterDelegateQt::DeleteAllOnIOThread(net::CookieMonster::DeleteCallback callback)
-{
-    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-    if (m_cookieMonster)
-        m_cookieMonster->DeleteAllAsync(std::move(callback));
-}
-
-void CookieMonsterDelegateQt::setCookieMonster(net::CookieMonster *monster)
-{
-    if (monster == m_cookieMonster)
-        return;
-
-    m_subscriptions.clear();
-    if (monster)
-        AddStore(monster);
-
-    m_cookieMonster = monster;
-
-    if (!m_client)
-        return;
-
-    if (monster)
-        m_client->d_func()->processPendingUserCookies();
-    else
-        m_client->d_func()->rejectPendingUserCookies();
+    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));
 }
 
 void CookieMonsterDelegateQt::setMojoCookieManager(network::mojom::CookieManagerPtrInfo cookie_manager_info)
@@ -336,18 +221,6 @@ void CookieMonsterDelegateQt::OnCookieChanged(const net::CanonicalCookie &cookie
     m_client->d_func()->onCookieChanged(toQt(cookie), cause != net::CookieChangeCause::INSERTED);
 }
 
-void CookieMonsterDelegateQt::GetAllCookiesCallbackOnIOThread(qint64 callbackId, const net::CookieList &cookies, const net::CookieStatusList &statusList)
-{
-    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-    QByteArray rawCookies;
-    for (auto &&cookie : cookies)
-        rawCookies += toQt(cookie).toRawForm() % QByteArrayLiteral("\n");
-
-    base::PostTaskWithTraits(
-                FROM_HERE, {content::BrowserThread::UI},
-                base::BindOnce(&CookieMonsterDelegateQt::GetAllCookiesResultOnUIThread, this, callbackId, rawCookies));
-}
-
 void CookieMonsterDelegateQt::GetAllCookiesCallbackOnUIThread(qint64 callbackId, const std::vector<net::CanonicalCookie> &cookies)
 {
     DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@@ -358,22 +231,6 @@ void CookieMonsterDelegateQt::GetAllCookiesCallbackOnUIThread(qint64 callbackId,
     GetAllCookiesResultOnUIThread(callbackId, rawCookies);
 }
 
-void CookieMonsterDelegateQt::SetCookieCallbackOnIOThread(qint64 callbackId, net::CanonicalCookie::CookieInclusionStatus status)
-{
-    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-    base::PostTaskWithTraits(
-                FROM_HERE, {content::BrowserThread::UI},
-                base::BindOnce(&CookieMonsterDelegateQt::SetCookieCallbackOnUIThread, this, callbackId, status));
-}
-
-void CookieMonsterDelegateQt::DeleteCookiesCallbackOnIOThread(qint64 callbackId, uint numCookies)
-{
-    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-    base::PostTaskWithTraits(
-                FROM_HERE, {content::BrowserThread::UI},
-                base::BindOnce(&CookieMonsterDelegateQt::DeleteCookiesCallbackOnUIThread, this, callbackId, numCookies));
-}
-
 void CookieMonsterDelegateQt::GetAllCookiesResultOnUIThread(qint64 callbackId, const QByteArray &cookies)
 {
     if (m_client)