Fix CookieMonster assertions

With CookieMonster now being the CookieStore, it must only be accessed
from the IO thread like the CookieStore, so we need to pass calls to the
IO thread and back.

Change-Id: Icb6d6008c08cfe006c4c1bc2324824223cb82fba
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>

1 files changed, 8 insertions, 1 deletions

diff --git a/src/core/cookie_monster_delegate_qt.h b/src/core/cookie_monster_delegate_qt.h
index 2ff5eeaa6..f47dc86df 100644
--- a/src/core/cookie_monster_delegate_qt.h
+++ b/src/core/cookie_monster_delegate_qt.h
@@ -66,7 +66,7 @@ static const char* const kCookieableSchemes[] =
 
 class QWEBENGINE_EXPORT CookieMonsterDelegateQt: public net::CookieMonsterDelegate {
     QPointer<QWebEngineCookieStore> m_client;
-    scoped_refptr<net::CookieMonster> m_cookieMonster;
+    net::CookieMonster *m_cookieMonster;
 public:
     CookieMonsterDelegateQt();
     ~CookieMonsterDelegateQt();
@@ -84,6 +84,13 @@ public:
 
     bool canSetCookie(const QUrl &firstPartyUrl, const QByteArray &cookieLine, const QUrl &url);
     void OnCookieChanged(const net::CanonicalCookie& cookie, bool removed, ChangeCause cause) override;
+
+private:
+    void GetAllCookiesOnIOThread(const net::CookieMonster::GetCookieListCallback& callback);
+    void SetCookieOnIOThread(const GURL& url, const std::string& cookie_line, const net::CookieMonster::SetCookiesCallback& callback);
+    void DeleteCookieOnIOThread(const GURL& url, const std::string& cookie_name);
+    void DeleteSessionCookiesOnIOThread(const net::CookieMonster::DeleteCallback& callback);
+    void DeleteAllOnIOThread(const net::CookieMonster::DeleteCallback& callback);
 };
 
 }