Rename QWebEngineCookieStoreClient to QWebEngineCookieStore

Change-Id: I8f9a4c5c155a65ede24908799218fd867db0767c
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>

9 files changed, 95 insertions, 95 deletions

diff --git a/src/core/api/core_api.pro b/src/core/api/core_api.pro
index e4cdf43cb..e62578db2 100644
--- a/src/core/api/core_api.pro
+++ b/src/core/api/core_api.pro
@@ -33,8 +33,8 @@ HEADERS = \
     qwebenginecallback_p.h \
     qtwebenginecoreglobal.h \
     qtwebenginecoreglobal_p.h \
-    qwebenginecookiestoreclient.h \
-    qwebenginecookiestoreclient_p.h \
+    qwebenginecookiestore.h \
+    qwebenginecookiestore_p.h \
     qwebengineurlrequestinterceptor.h \
     qwebengineurlrequestinfo.h \
     qwebengineurlrequestinfo_p.h \
@@ -42,7 +42,7 @@ HEADERS = \
     qwebengineurlschemehandler.h
 
 SOURCES = \
-    qwebenginecookiestoreclient.cpp \
+    qwebenginecookiestore.cpp \
     qwebengineurlrequestinfo.cpp \
     qwebengineurlrequestjob.cpp \
     qwebengineurlschemehandler.cpp
diff --git a/src/core/api/qwebenginecookiestoreclient.cpp b/src/core/api/qwebenginecookiestore.cpp
index bd43b871d..61d210192 100644
--- a/src/core/api/qwebenginecookiestoreclient.cpp
+++ b/src/core/api/qwebenginecookiestore.cpp
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#include "qwebenginecookiestoreclient.h"
-#include "qwebenginecookiestoreclient_p.h"
+#include "qwebenginecookiestore.h"
+#include "qwebenginecookiestore_p.h"
 
 #include <cookie_monster_delegate_qt.h>
 
@@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE
 
 using namespace QtWebEngineCore;
 
-QWebEngineCookieStoreClientPrivate::QWebEngineCookieStoreClientPrivate(QWebEngineCookieStoreClient* q)
+QWebEngineCookieStorePrivate::QWebEngineCookieStorePrivate(QWebEngineCookieStore* q)
     : m_nextCallbackId(CallbackDirectory::ReservedCallbackIdsEnd)
     , m_deleteSessionCookiesPending(false)
     , m_deleteAllCookiesPending(false)
@@ -56,12 +56,12 @@ QWebEngineCookieStoreClientPrivate::QWebEngineCookieStoreClientPrivate(QWebEngin
 {
 }
 
-QWebEngineCookieStoreClientPrivate::~QWebEngineCookieStoreClientPrivate()
+QWebEngineCookieStorePrivate::~QWebEngineCookieStorePrivate()
 {
 
 }
 
-void QWebEngineCookieStoreClientPrivate::processPendingUserCookies()
+void QWebEngineCookieStorePrivate::processPendingUserCookies()
 {
     Q_ASSERT(delegate);
     Q_ASSERT(delegate->hasCookieMonster());
@@ -94,7 +94,7 @@ void QWebEngineCookieStoreClientPrivate::processPendingUserCookies()
     m_pendingUserCookies.clear();
 }
 
-void QWebEngineCookieStoreClientPrivate::setCookie(const QWebEngineCallback<bool> &callback, const QNetworkCookie &cookie, const QUrl &origin)
+void QWebEngineCookieStorePrivate::setCookie(const QWebEngineCallback<bool> &callback, const QNetworkCookie &cookie, const QUrl &origin)
 {
     const quint64 currentCallbackId = callback ? m_nextCallbackId++ : static_cast<quint64>(CallbackDirectory::NoCallbackId);
 
@@ -109,7 +109,7 @@ void QWebEngineCookieStoreClientPrivate::setCookie(const QWebEngineCallback<bool
     delegate->setCookie(currentCallbackId, cookie, origin);
 }
 
-void QWebEngineCookieStoreClientPrivate::deleteCookie(const QNetworkCookie &cookie, const QUrl &url)
+void QWebEngineCookieStorePrivate::deleteCookie(const QNetworkCookie &cookie, const QUrl &url)
 {
     if (!delegate || !delegate->hasCookieMonster()) {
         m_pendingUserCookies.append(CookieData{ CallbackDirectory::DeleteCookieCallbackId, cookie, url });
@@ -119,7 +119,7 @@ void QWebEngineCookieStoreClientPrivate::deleteCookie(const QNetworkCookie &cook
     delegate->deleteCookie(cookie, url);
 }
 
-void QWebEngineCookieStoreClientPrivate::deleteSessionCookies()
+void QWebEngineCookieStorePrivate::deleteSessionCookies()
 {
     if (!delegate || !delegate->hasCookieMonster()) {
         m_deleteSessionCookiesPending = true;
@@ -129,7 +129,7 @@ void QWebEngineCookieStoreClientPrivate::deleteSessionCookies()
     delegate->deleteSessionCookies(CallbackDirectory::DeleteSessionCookiesCallbackId);
 }
 
-void QWebEngineCookieStoreClientPrivate::deleteAllCookies()
+void QWebEngineCookieStorePrivate::deleteAllCookies()
 {
     if (!delegate || !delegate->hasCookieMonster()) {
         m_deleteAllCookiesPending = true;
@@ -140,7 +140,7 @@ void QWebEngineCookieStoreClientPrivate::deleteAllCookies()
     delegate->deleteAllCookies(CallbackDirectory::DeleteAllCookiesCallbackId);
 }
 
-void QWebEngineCookieStoreClientPrivate::getAllCookies()
+void QWebEngineCookieStorePrivate::getAllCookies()
 {
     if (!delegate || !delegate->hasCookieMonster()) {
         m_getAllCookiesPending = true;
@@ -150,48 +150,48 @@ void QWebEngineCookieStoreClientPrivate::getAllCookies()
     delegate->getAllCookies(CallbackDirectory::GetAllCookiesCallbackId);
 }
 
-void QWebEngineCookieStoreClientPrivate::onGetAllCallbackResult(qint64 callbackId, const QByteArray &cookieList)
+void QWebEngineCookieStorePrivate::onGetAllCallbackResult(qint64 callbackId, const QByteArray &cookieList)
 {
     callbackDirectory.invoke(callbackId, cookieList);
 }
-void QWebEngineCookieStoreClientPrivate::onSetCallbackResult(qint64 callbackId, bool success)
+void QWebEngineCookieStorePrivate::onSetCallbackResult(qint64 callbackId, bool success)
 {
     callbackDirectory.invoke(callbackId, success);
 }
 
-void QWebEngineCookieStoreClientPrivate::onDeleteCallbackResult(qint64 callbackId, int numCookies)
+void QWebEngineCookieStorePrivate::onDeleteCallbackResult(qint64 callbackId, int numCookies)
 {
     callbackDirectory.invoke(callbackId, numCookies);
 }
 
-void QWebEngineCookieStoreClientPrivate::onCookieChanged(const QNetworkCookie &cookie, bool removed)
+void QWebEngineCookieStorePrivate::onCookieChanged(const QNetworkCookie &cookie, bool removed)
 {
-    Q_Q(QWebEngineCookieStoreClient);
+    Q_Q(QWebEngineCookieStore);
     if (removed)
         Q_EMIT q->cookieRemoved(cookie);
     else
         Q_EMIT q->cookieAdded(cookie);
 }
 
-bool QWebEngineCookieStoreClientPrivate::canSetCookie(const QUrl &firstPartyUrl, const QByteArray &cookieLine, const QUrl &url)
+bool QWebEngineCookieStorePrivate::canSetCookie(const QUrl &firstPartyUrl, const QByteArray &cookieLine, const QUrl &url)
 {
     if (filterCallback) {
-        QWebEngineCookieStoreClient::FilterRequest request;
+        QWebEngineCookieStore::FilterRequest request;
         request.accepted = true;
         request.firstPartyUrl = firstPartyUrl;
         request.cookieLine = cookieLine;
         request.cookieSource = url;
-        callbackDirectory.invokeDirectly<QWebEngineCookieStoreClient::FilterRequest&>(filterCallback, request);
+        callbackDirectory.invokeDirectly<QWebEngineCookieStore::FilterRequest&>(filterCallback, request);
         return request.accepted;
     }
     return true;
 }
 
 /*!
-    \class QWebEngineCookieStoreClient
+    \class QWebEngineCookieStore
     \inmodule QtWebEngineCore
     \since 5.6
-    \brief The QWebEngineCookieStoreClient class provides access to Chromium's cookies.
+    \brief The QWebEngineCookieStore class provides access to Chromium's cookies.
 
     The class allows to access HTTP cookies of Chromium for a specific profile.
     It can be used to synchronize cookies of Chromium and the QNetworkAccessManager, as well as
@@ -203,7 +203,7 @@ bool QWebEngineCookieStoreClientPrivate::canSetCookie(const QUrl &firstPartyUrl,
 */
 
 /*!
-    \class QWebEngineCookieStoreClient::FilterRequest
+    \class QWebEngineCookieStore::FilterRequest
     \inmodule QtWebEngineCore
     \since 5.6
 
@@ -212,45 +212,45 @@ bool QWebEngineCookieStoreClientPrivate::canSetCookie(const QUrl &firstPartyUrl,
 */
 
 /*!
-    \variable QWebEngineCookieStoreClient::FilterRequest::accepted
+    \variable QWebEngineCookieStore::FilterRequest::accepted
     Whether the cookie shall be accepted. The default is \c true.
-    \variable QWebEngineCookieStoreClient::FilterRequest::firstPartyUrl
+    \variable QWebEngineCookieStore::FilterRequest::firstPartyUrl
     URL of page that triggered the setting of the cookie.
-    \variable QWebEngineCookieStoreClient::FilterRequest::cookieLine
+    \variable QWebEngineCookieStore::FilterRequest::cookieLine
     Content of the cookie.
-    \variable QWebEngineCookieStoreClient::FilterRequest::cookieSource
+    \variable QWebEngineCookieStore::FilterRequest::cookieSource
     URL of site that sets the cookie.
 */
 
 
 /*!
-    \fn void QWebEngineCookieStoreClient::cookieAdded(const QNetworkCookie &cookie)
+    \fn void QWebEngineCookieStore::cookieAdded(const QNetworkCookie &cookie)
 
     This signal is emitted whenever a new \a cookie is added to the cookie store.
 */
 
 /*!
-    \fn void QWebEngineCookieStoreClient::cookieRemoved(const QNetworkCookie &cookie)
+    \fn void QWebEngineCookieStore::cookieRemoved(const QNetworkCookie &cookie)
 
     This signal is emitted whenever a \a cookie is deleted from the cookie store.
 */
 
 /*!
-    Creates a new QWebEngineCookieStoreClient object with \a parent.
+    Creates a new QWebEngineCookieStore object with \a parent.
 */
 
-QWebEngineCookieStoreClient::QWebEngineCookieStoreClient(QObject *parent)
+QWebEngineCookieStore::QWebEngineCookieStore(QObject *parent)
     : QObject(parent)
-    , d_ptr(new QWebEngineCookieStoreClientPrivate(this))
+    , d_ptr(new QWebEngineCookieStorePrivate(this))
 {
 
 }
 
 /*!
-    Destroys this QWebEngineCookieStoreClient object.
+    Destroys this QWebEngineCookieStore object.
 */
 
-QWebEngineCookieStoreClient::~QWebEngineCookieStoreClient()
+QWebEngineCookieStore::~QWebEngineCookieStore()
 {
 
 }
@@ -266,9 +266,9 @@ QWebEngineCookieStoreClient::~QWebEngineCookieStoreClient()
     \sa setCookie()
 */
 
-void QWebEngineCookieStoreClient::setCookieWithCallback(const QNetworkCookie &cookie, const QWebEngineCallback<bool> &resultCallback, const QUrl &origin)
+void QWebEngineCookieStore::setCookieWithCallback(const QNetworkCookie &cookie, const QWebEngineCallback<bool> &resultCallback, const QUrl &origin)
 {
-    Q_D(QWebEngineCookieStoreClient);
+    Q_D(QWebEngineCookieStore);
     d->setCookie(resultCallback, cookie, origin);
 }
 
@@ -281,7 +281,7 @@ void QWebEngineCookieStoreClient::setCookieWithCallback(const QNetworkCookie &co
     \sa setCookieWithCallback()
 */
 
-void QWebEngineCookieStoreClient::setCookie(const QNetworkCookie &cookie, const QUrl &origin)
+void QWebEngineCookieStore::setCookie(const QNetworkCookie &cookie, const QUrl &origin)
 {
     setCookieWithCallback(cookie, QWebEngineCallback<bool>(), origin);
 }
@@ -293,14 +293,14 @@ void QWebEngineCookieStoreClient::setCookie(const QNetworkCookie &cookie, const
     The provided URL should also include the scheme.
 */
 
-void QWebEngineCookieStoreClient::deleteCookie(const QNetworkCookie &cookie, const QUrl &origin)
+void QWebEngineCookieStore::deleteCookie(const QNetworkCookie &cookie, const QUrl &origin)
 {
-    Q_D(QWebEngineCookieStoreClient);
+    Q_D(QWebEngineCookieStore);
     d->deleteCookie(cookie, origin);
 }
 
 /*!
-    \fn void QWebEngineCookieStoreClient::getAllCookies(FunctorOrLambda resultCallback)
+    \fn void QWebEngineCookieStore::getAllCookies(FunctorOrLambda resultCallback)
 
     Requests all the cookies in the cookie store. When the asynchronous operation finishes,
     \a resultCallback will be called with a QByteArray as the argument containing the cookies.
@@ -309,9 +309,9 @@ void QWebEngineCookieStoreClient::deleteCookie(const QNetworkCookie &cookie, con
     \sa deleteCookie()
 */
 
-void QWebEngineCookieStoreClient::getAllCookies(const QWebEngineCallback<const QByteArray&> &resultCallback)
+void QWebEngineCookieStore::getAllCookies(const QWebEngineCallback<const QByteArray&> &resultCallback)
 {
-    Q_D(QWebEngineCookieStoreClient);
+    Q_D(QWebEngineCookieStore);
     if (d->m_getAllCookiesPending) {
         d->callbackDirectory.invokeEmpty(resultCallback);
         return;
@@ -321,7 +321,7 @@ void QWebEngineCookieStoreClient::getAllCookies(const QWebEngineCallback<const Q
 }
 
 /*!
-    \fn void QWebEngineCookieStoreClient::deleteSessionCookiesWithCallback(FunctorOrLambda resultCallback)
+    \fn void QWebEngineCookieStore::deleteSessionCookiesWithCallback(FunctorOrLambda resultCallback)
 
     Deletes all the session cookies in the cookie store. Session cookies do not have an
     expiration date assigned to them.
@@ -329,9 +329,9 @@ void QWebEngineCookieStoreClient::getAllCookies(const QWebEngineCallback<const Q
     number of cookies deleted as the argument.
 */
 
-void QWebEngineCookieStoreClient::deleteSessionCookiesWithCallback(const QWebEngineCallback<int> &resultCallback)
+void QWebEngineCookieStore::deleteSessionCookiesWithCallback(const QWebEngineCallback<int> &resultCallback)
 {
-    Q_D(QWebEngineCookieStoreClient);
+    Q_D(QWebEngineCookieStore);
     if (d->m_deleteAllCookiesPending || d->m_deleteSessionCookiesPending) {
         d->callbackDirectory.invokeEmpty(resultCallback);
         return;
@@ -341,7 +341,7 @@ void QWebEngineCookieStoreClient::deleteSessionCookiesWithCallback(const QWebEng
 }
 
 /*!
-    \fn void QWebEngineCookieStoreClient::deleteAllCookiesWithCallback(FunctorOrLambda resultCallback)
+    \fn void QWebEngineCookieStore::deleteAllCookiesWithCallback(FunctorOrLambda resultCallback)
 
     Deletes all the cookies in the cookie store. When the asynchronous operation finishes,
     \a resultCallback will be called with the number of cookies deleted as the argument.
@@ -349,9 +349,9 @@ void QWebEngineCookieStoreClient::deleteSessionCookiesWithCallback(const QWebEng
     \sa deleteSessionCookiesWithCallback(), getAllCookies()
 */
 
-void QWebEngineCookieStoreClient::deleteAllCookiesWithCallback(const QWebEngineCallback<int> &resultCallback)
+void QWebEngineCookieStore::deleteAllCookiesWithCallback(const QWebEngineCallback<int> &resultCallback)
 {
-    Q_D(QWebEngineCookieStoreClient);
+    Q_D(QWebEngineCookieStore);
     if (d->m_deleteAllCookiesPending) {
         d->callbackDirectory.invokeEmpty(resultCallback);
         return;
@@ -366,7 +366,7 @@ void QWebEngineCookieStoreClient::deleteAllCookiesWithCallback(const QWebEngineC
     \sa deleteSessionCookiesWithCallback()
 */
 
-void QWebEngineCookieStoreClient::deleteSessionCookies()
+void QWebEngineCookieStore::deleteSessionCookies()
 {
     deleteSessionCookiesWithCallback(QWebEngineCallback<int>());
 }
@@ -377,13 +377,13 @@ void QWebEngineCookieStoreClient::deleteSessionCookies()
     \sa deleteAllCookiesWithCallback(), getAllCookies()
 */
 
-void QWebEngineCookieStoreClient::deleteAllCookies()
+void QWebEngineCookieStore::deleteAllCookies()
 {
     deleteAllCookiesWithCallback(QWebEngineCallback<int>());
 }
 
 /*!
-  \fn void QWebEngineCookieStoreClient::setCookieFilter(FunctorOrLambda filterCallback)
+  \fn void QWebEngineCookieStore::setCookieFilter(FunctorOrLambda filterCallback)
 
     Installs a cookie filter that can reject cookies before they are added to the cookie store.
     The \a filterCallback must be a lambda or functor taking FilterRequest structure. If the
@@ -394,9 +394,9 @@ void QWebEngineCookieStoreClient::deleteAllCookies()
 
     \sa deleteAllCookiesWithCallback(), getAllCookies()
 */
-void QWebEngineCookieStoreClient::setCookieFilter(const QWebEngineCallback<QWebEngineCookieStoreClient::FilterRequest&> &filter)
+void QWebEngineCookieStore::setCookieFilter(const QWebEngineCallback<QWebEngineCookieStore::FilterRequest&> &filter)
 {
-    Q_D(QWebEngineCookieStoreClient);
+    Q_D(QWebEngineCookieStore);
     d->filterCallback = filter;
 }
 
diff --git a/src/core/api/qwebenginecookiestoreclient.h b/src/core/api/qwebenginecookiestore.h
index 4664a8459..6cbe399f2 100644
--- a/src/core/api/qwebenginecookiestoreclient.h
+++ b/src/core/api/qwebenginecookiestore.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QWEBENGINECOOKIESTORECLIENT_H
-#define QWEBENGINECOOKIESTORECLIENT_H
+#ifndef QWEBENGINECOOKIESTORE_H
+#define QWEBENGINECOOKIESTORE_H
 
 #include "qtwebenginecoreglobal.h"
 #include "qwebenginecallback.h"
@@ -52,8 +52,8 @@ class CookieMonsterDelegateQt;
 
 QT_BEGIN_NAMESPACE
 
-class QWebEngineCookieStoreClientPrivate;
-class QWEBENGINE_EXPORT QWebEngineCookieStoreClient : public QObject {
+class QWebEngineCookieStorePrivate;
+class QWEBENGINE_EXPORT QWebEngineCookieStore : public QObject {
     Q_OBJECT
 
 public:
@@ -64,7 +64,7 @@ public:
         QByteArray cookieLine;
         QUrl cookieSource;
     };
-    virtual ~QWebEngineCookieStoreClient();
+    virtual ~QWebEngineCookieStore();
 
 #ifdef Q_QDOC
     void setCookieWithCallback(const QNetworkCookie &cookie, FunctorOrLambda resultCallback, const QUrl &origin = QUrl());
@@ -89,16 +89,16 @@ Q_SIGNALS:
     void cookieRemoved(const QNetworkCookie &cookie);
 
 private:
-    explicit QWebEngineCookieStoreClient(QObject *parent = 0);
+    explicit QWebEngineCookieStore(QObject *parent = 0);
     friend class QtWebEngineCore::BrowserContextAdapter;
     friend class QtWebEngineCore::CookieMonsterDelegateQt;
-    Q_DISABLE_COPY(QWebEngineCookieStoreClient)
-    Q_DECLARE_PRIVATE(QWebEngineCookieStoreClient)
-    QScopedPointer<QWebEngineCookieStoreClientPrivate> d_ptr;
+    Q_DISABLE_COPY(QWebEngineCookieStore)
+    Q_DECLARE_PRIVATE(QWebEngineCookieStore)
+    QScopedPointer<QWebEngineCookieStorePrivate> d_ptr;
 };
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(QWebEngineCookieStoreClient*)
+Q_DECLARE_METATYPE(QWebEngineCookieStore*)
 
-#endif // QWEBENGINECOOKIESTORECLIENT_H
+#endif // QWEBENGINECOOKIESTORE_H
diff --git a/src/core/api/qwebenginecookiestoreclient_p.h b/src/core/api/qwebenginecookiestore_p.h
index 54f3b9eb7..a253abd38 100644
--- a/src/core/api/qwebenginecookiestoreclient_p.h
+++ b/src/core/api/qwebenginecookiestore_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QWEBENGINECOOKIESTORECLIENT_P_H
-#define QWEBENGINECOOKIESTORECLIENT_P_H
+#ifndef QWEBENGINECOOKIESTORE_P_H
+#define QWEBENGINECOOKIESTORE_P_H
 
 //
 //  W A R N I N G
@@ -51,7 +51,7 @@
 #include "qtwebenginecoreglobal_p.h"
 
 #include "qwebenginecallback_p.h"
-#include "qwebenginecookiestoreclient.h"
+#include "qwebenginecookiestore.h"
 
 #include <QVector>
 #include <QNetworkCookie>
@@ -63,7 +63,7 @@ class CookieMonsterDelegateQt;
 
 QT_BEGIN_NAMESPACE
 
-class QWEBENGINE_PRIVATE_EXPORT QWebEngineCookieStoreClientPrivate {
+class QWEBENGINE_PRIVATE_EXPORT QWebEngineCookieStorePrivate {
     struct CookieData {
         quint64 callbackId;
         QNetworkCookie cookie;
@@ -71,9 +71,9 @@ class QWEBENGINE_PRIVATE_EXPORT QWebEngineCookieStoreClientPrivate {
     };
     friend class QTypeInfo<CookieData>;
 public:
-    Q_DECLARE_PUBLIC(QWebEngineCookieStoreClient)
+    Q_DECLARE_PUBLIC(QWebEngineCookieStore)
     QtWebEngineCore::CallbackDirectory callbackDirectory;
-    QWebEngineCallback<QWebEngineCookieStoreClient::FilterRequest&> filterCallback;
+    QWebEngineCallback<QWebEngineCookieStore::FilterRequest&> filterCallback;
     QVector<CookieData> m_pendingUserCookies;
     quint64 m_nextCallbackId;
     bool m_deleteSessionCookiesPending;
@@ -81,10 +81,10 @@ public:
     bool m_getAllCookiesPending;
 
     QtWebEngineCore::CookieMonsterDelegateQt *delegate;
-    QWebEngineCookieStoreClient *q_ptr;
+    QWebEngineCookieStore *q_ptr;
 
-    QWebEngineCookieStoreClientPrivate(QWebEngineCookieStoreClient *q);
-    ~QWebEngineCookieStoreClientPrivate();
+    QWebEngineCookieStorePrivate(QWebEngineCookieStore *q);
+    ~QWebEngineCookieStorePrivate();
 
     void processPendingUserCookies();
     void setCookie(const QWebEngineCallback<bool> &callback, const QNetworkCookie &cookie, const QUrl &origin);
@@ -101,8 +101,8 @@ public:
     void onCookieChanged(const QNetworkCookie &cookie, bool removed);
 };
 
-Q_DECLARE_TYPEINFO(QWebEngineCookieStoreClientPrivate::CookieData, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QWebEngineCookieStorePrivate::CookieData, Q_MOVABLE_TYPE);
 
 QT_END_NAMESPACE
 
-#endif // QWEBENGINECOOKIESTORECLIENT_P_H
+#endif // QWEBENGINECOOKIESTORE_P_H
diff --git a/src/core/browser_context_adapter.cpp b/src/core/browser_context_adapter.cpp
index b5fdf2ce0..7b40688a1 100644
--- a/src/core/browser_context_adapter.cpp
+++ b/src/core/browser_context_adapter.cpp
@@ -136,11 +136,11 @@ DownloadManagerDelegateQt *BrowserContextAdapter::downloadManagerDelegate()
     return m_downloadManagerDelegate.data();
 }
 
-QWebEngineCookieStoreClient *BrowserContextAdapter::cookieStoreClient()
+QWebEngineCookieStore *BrowserContextAdapter::cookieStore()
 {
-    if (!m_cookieStoreClient)
-        m_cookieStoreClient.reset(new QWebEngineCookieStoreClient);
-    return m_cookieStoreClient.data();
+    if (!m_cookieStore)
+        m_cookieStore.reset(new QWebEngineCookieStore);
+    return m_cookieStore.data();
 }
 
 QWebEngineUrlRequestInterceptor *BrowserContextAdapter::requestInterceptor()
diff --git a/src/core/browser_context_adapter.h b/src/core/browser_context_adapter.h
index 818dfda3d..97a4dca4a 100644
--- a/src/core/browser_context_adapter.h
+++ b/src/core/browser_context_adapter.h
@@ -46,7 +46,7 @@
 #include <QString>
 #include <QVector>
 
-#include "api/qwebenginecookiestoreclient.h"
+#include "api/qwebenginecookiestore.h"
 #include "api/qwebengineurlrequestinterceptor.h"
 #include "api/qwebengineurlschemehandler.h"
 
@@ -73,7 +73,7 @@ public:
     WebEngineVisitedLinksManager *visitedLinksManager();
     DownloadManagerDelegateQt *downloadManagerDelegate();
 
-    QWebEngineCookieStoreClient *cookieStoreClient();
+    QWebEngineCookieStore *cookieStore();
 
     QWebEngineUrlRequestInterceptor* requestInterceptor();
     void setRequestInterceptor(QWebEngineUrlRequestInterceptor *interceptor);
@@ -164,7 +164,7 @@ private:
     QScopedPointer<WebEngineVisitedLinksManager> m_visitedLinksManager;
     QScopedPointer<DownloadManagerDelegateQt> m_downloadManagerDelegate;
     QScopedPointer<UserScriptControllerHost> m_userScriptController;
-    QScopedPointer<QWebEngineCookieStoreClient> m_cookieStoreClient;
+    QScopedPointer<QWebEngineCookieStore> m_cookieStore;
     QPointer<QWebEngineUrlRequestInterceptor> m_requestInterceptor;
 
     QString m_dataPath;
diff --git a/src/core/cookie_monster_delegate_qt.cpp b/src/core/cookie_monster_delegate_qt.cpp
index 7622614ca..a81670a6c 100644
--- a/src/core/cookie_monster_delegate_qt.cpp
+++ b/src/core/cookie_monster_delegate_qt.cpp
@@ -40,8 +40,8 @@
 #include "content/public/browser/browser_thread.h"
 #include "net/cookies/cookie_util.h"
 
-#include "api/qwebenginecookiestoreclient.h"
-#include "api/qwebenginecookiestoreclient_p.h"
+#include "api/qwebenginecookiestore.h"
+#include "api/qwebenginecookiestore_p.h"
 #include "type_conversion.h"
 
 #include <QStringBuilder>
@@ -53,15 +53,15 @@ static GURL sourceUrlForCookie(const QNetworkCookie &cookie) {
     return net::cookie_util::CookieOriginToURL(urlFragment.toStdString(), /* is_https */ cookie.isSecure());
 }
 
-static void onSetCookieCallback(QWebEngineCookieStoreClientPrivate *client, qint64 callbackId, bool success) {
+static void onSetCookieCallback(QWebEngineCookieStorePrivate *client, qint64 callbackId, bool success) {
     client->onSetCallbackResult(callbackId, success);
 }
 
-static void onDeleteCookiesCallback(QWebEngineCookieStoreClientPrivate *client, qint64 callbackId, int numCookies) {
+static void onDeleteCookiesCallback(QWebEngineCookieStorePrivate *client, qint64 callbackId, int numCookies) {
     client->onDeleteCallbackResult(callbackId, numCookies);
 }
 
-static void onGetAllCookiesCallback(QWebEngineCookieStoreClientPrivate *client, qint64 callbackId, const net::CookieList& cookies) {
+static void onGetAllCookiesCallback(QWebEngineCookieStorePrivate *client, qint64 callbackId, const net::CookieList& cookies) {
     QByteArray rawCookies;
     for (auto&& cookie: cookies)
         rawCookies += toQt(cookie).toRawForm() % QByteArrayLiteral("\n");
@@ -145,7 +145,7 @@ void CookieMonsterDelegateQt::setCookieMonster(net::CookieMonster* monster)
         m_client->d_func()->processPendingUserCookies();
 }
 
-void CookieMonsterDelegateQt::setClient(QWebEngineCookieStoreClient *client)
+void CookieMonsterDelegateQt::setClient(QWebEngineCookieStore *client)
 {
     m_client = client;
 
diff --git a/src/core/cookie_monster_delegate_qt.h b/src/core/cookie_monster_delegate_qt.h
index db80bf0a1..c9f27c2bc 100644
--- a/src/core/cookie_monster_delegate_qt.h
+++ b/src/core/cookie_monster_delegate_qt.h
@@ -50,7 +50,7 @@ QT_WARNING_POP
 #include <QNetworkCookie>
 #include <QPointer>
 
-QT_FORWARD_DECLARE_CLASS(QWebEngineCookieStoreClient)
+QT_FORWARD_DECLARE_CLASS(QWebEngineCookieStore)
 
 namespace QtWebEngineCore {
 
@@ -62,7 +62,7 @@ static const char* const kCookieableSchemes[] =
     { "http", "https", "qrc", "ws", "wss" };
 
 class QWEBENGINE_EXPORT CookieMonsterDelegateQt: public net::CookieMonsterDelegate {
-    QPointer<QWebEngineCookieStoreClient> m_client;
+    QPointer<QWebEngineCookieStore> m_client;
     scoped_refptr<net::CookieMonster> m_cookieMonster;
 public:
     CookieMonsterDelegateQt();
@@ -77,7 +77,7 @@ public:
     void deleteAllCookies(quint64 callbackId);
 
     void setCookieMonster(net::CookieMonster* monster);
-    void setClient(QWebEngineCookieStoreClient *client);
+    void setClient(QWebEngineCookieStore *client);
 
     bool canSetCookie(const QUrl &firstPartyUrl, const QByteArray &cookieLine, const QUrl &url);
     void OnCookieChanged(const net::CanonicalCookie& cookie, bool removed, ChangeCause cause) override;
diff --git a/src/core/url_request_context_getter_qt.cpp b/src/core/url_request_context_getter_qt.cpp
index 26e1dbea8..5460e083f 100644
--- a/src/core/url_request_context_getter_qt.cpp
+++ b/src/core/url_request_context_getter_qt.cpp
@@ -74,8 +74,8 @@
 #include "network_delegate_qt.h"
 #include "proxy_config_service_qt.h"
 #include "qrc_protocol_handler_qt.h"
-#include "qwebenginecookiestoreclient.h"
-#include "qwebenginecookiestoreclient_p.h"
+#include "qwebenginecookiestore.h"
+#include "qwebenginecookiestore_p.h"
 #include "type_conversion.h"
 
 namespace QtWebEngineCore {
@@ -204,7 +204,7 @@ void URLRequestContextGetterQt::generateCookieStore()
     // Unset it first to get a chance to destroy and flush the old cookie store before before opening a new on possibly the same file.
     m_storage->set_cookie_store(0);
     m_cookieDelegate->setCookieMonster(0);
-    m_cookieDelegate->setClient(m_browserContext->cookieStoreClient());
+    m_cookieDelegate->setClient(m_browserContext->cookieStore());
 
     net::CookieStore* cookieStore = 0;
     switch (m_browserContext->persistentCookiesPolicy()) {