Rename QWebEngineCookieStoreClient to QWebEngineCookieStore

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

8 files changed, 25 insertions, 25 deletions

diff --git a/tests/auto/core/core.pro b/tests/auto/core/core.pro
index 713c71d14..09b0dd69d 100644
--- a/tests/auto/core/core.pro
+++ b/tests/auto/core/core.pro
@@ -1,5 +1,5 @@
 TEMPLATE = subdirs
 
 SUBDIRS += \
-    qwebenginecookiestoreclient \
+    qwebenginecookiestore \
     qwebengineurlrequestinterceptor \
diff --git a/tests/auto/core/qwebenginecookiestoreclient/qwebenginecookiestoreclient.pro b/tests/auto/core/qwebenginecookiestore/qwebenginecookiestore.pro
index e99c7f493..e99c7f493 100644
--- a/tests/auto/core/qwebenginecookiestoreclient/qwebenginecookiestoreclient.pro
+++ b/tests/auto/core/qwebenginecookiestore/qwebenginecookiestore.pro
diff --git a/tests/auto/core/qwebenginecookiestoreclient/resources/content.html b/tests/auto/core/qwebenginecookiestore/resources/content.html
index 360ad65ef..360ad65ef 100644
--- a/tests/auto/core/qwebenginecookiestoreclient/resources/content.html
+++ b/tests/auto/core/qwebenginecookiestore/resources/content.html
diff --git a/tests/auto/core/qwebenginecookiestoreclient/resources/index.html b/tests/auto/core/qwebenginecookiestore/resources/index.html
index d41866712..d41866712 100644
--- a/tests/auto/core/qwebenginecookiestoreclient/resources/index.html
+++ b/tests/auto/core/qwebenginecookiestore/resources/index.html
diff --git a/tests/auto/core/qwebenginecookiestoreclient/tst_qwebenginecookiestoreclient.cpp b/tests/auto/core/qwebenginecookiestore/tst_qwebenginecookiestore.cpp
index ed2a5a55b..e26ca7048 100644
--- a/tests/auto/core/qwebenginecookiestoreclient/tst_qwebenginecookiestoreclient.cpp
+++ b/tests/auto/core/qwebenginecookiestore/tst_qwebenginecookiestore.cpp
@@ -42,18 +42,18 @@
 #include "../../widgets/util.h"
 #include <QtTest/QtTest>
 #include <QtWebEngineCore/qwebenginecallback.h>
-#include <QtWebEngineCore/qwebenginecookiestoreclient.h>
+#include <QtWebEngineCore/qwebenginecookiestore.h>
 #include <QtWebEngineWidgets/qwebenginepage.h>
 #include <QtWebEngineWidgets/qwebengineprofile.h>
 #include <QtWebEngineWidgets/qwebengineview.h>
 
-class tst_QWebEngineCookieStoreClient : public QObject
+class tst_QWebEngineCookieStore : public QObject
 {
     Q_OBJECT
 
 public:
-    tst_QWebEngineCookieStoreClient();
-    ~tst_QWebEngineCookieStoreClient();
+    tst_QWebEngineCookieStore();
+    ~tst_QWebEngineCookieStore();
 
 public Q_SLOTS:
     void init();
@@ -67,34 +67,34 @@ private Q_SLOTS:
     void batchCookieTasks();
 };
 
-tst_QWebEngineCookieStoreClient::tst_QWebEngineCookieStoreClient()
+tst_QWebEngineCookieStore::tst_QWebEngineCookieStore()
 {
 }
 
-tst_QWebEngineCookieStoreClient::~tst_QWebEngineCookieStoreClient()
+tst_QWebEngineCookieStore::~tst_QWebEngineCookieStore()
 {
 }
 
-void tst_QWebEngineCookieStoreClient::init()
+void tst_QWebEngineCookieStore::init()
 {
 }
 
-void tst_QWebEngineCookieStoreClient::cleanup()
+void tst_QWebEngineCookieStore::cleanup()
 {
 }
 
-void tst_QWebEngineCookieStoreClient::initTestCase()
+void tst_QWebEngineCookieStore::initTestCase()
 {
 }
 
-void tst_QWebEngineCookieStoreClient::cleanupTestCase()
+void tst_QWebEngineCookieStore::cleanupTestCase()
 {
 }
 
-void tst_QWebEngineCookieStoreClient::cookieSignals()
+void tst_QWebEngineCookieStore::cookieSignals()
 {
     QWebEngineView view;
-    QWebEngineCookieStoreClient *client = view.page()->profile()->cookieStoreClient();
+    QWebEngineCookieStore *client = view.page()->profile()->cookieStore();
 
     QSignalSpy loadSpy(&view, SIGNAL(loadFinished(bool)));
     QSignalSpy cookieAddedSpy(client, SIGNAL(cookieAdded(const QNetworkCookie &)));
@@ -119,11 +119,11 @@ void tst_QWebEngineCookieStoreClient::cookieSignals()
     QTRY_COMPARE(cookieRemovedSpy.count(), 1);
 }
 
-void tst_QWebEngineCookieStoreClient::setAndDeleteCookie()
+void tst_QWebEngineCookieStore::setAndDeleteCookie()
 {
     QTest::qWait(500);  // remove, when QTBUG-47946 is fixed!
     QWebEngineView view;
-    QWebEngineCookieStoreClient *client = view.page()->profile()->cookieStoreClient();
+    QWebEngineCookieStore *client = view.page()->profile()->cookieStore();
 
     QSignalSpy loadSpy(&view, SIGNAL(loadFinished(bool)));
     QSignalSpy cookieAddedSpy(client, SIGNAL(cookieAdded(const QNetworkCookie &)));
@@ -157,11 +157,11 @@ void tst_QWebEngineCookieStoreClient::setAndDeleteCookie()
     QTRY_COMPARE(cookieRemovedSpy.count(), 2);
 }
 
-void tst_QWebEngineCookieStoreClient::batchCookieTasks()
+void tst_QWebEngineCookieStore::batchCookieTasks()
 {
     QTest::qWait(500);  // remove, when QTBUG-47946 is fixed!
     QWebEngineView view;
-    QWebEngineCookieStoreClient *client = view.page()->profile()->cookieStoreClient();
+    QWebEngineCookieStore *client = view.page()->profile()->cookieStore();
 
     QSignalSpy loadSpy(&view, SIGNAL(loadFinished(bool)));
     QSignalSpy cookieAddedSpy(client, SIGNAL(cookieAdded(const QNetworkCookie &)));
@@ -206,5 +206,5 @@ void tst_QWebEngineCookieStoreClient::batchCookieTasks()
     QTRY_COMPARE(capture, 3);
 }
 
-QTEST_MAIN(tst_QWebEngineCookieStoreClient)
-#include "tst_qwebenginecookiestoreclient.moc"
+QTEST_MAIN(tst_QWebEngineCookieStore)
+#include "tst_qwebenginecookiestore.moc"
diff --git a/tests/auto/core/qwebenginecookiestoreclient/tst_qwebenginecookiestoreclient.qrc b/tests/auto/core/qwebenginecookiestore/tst_qwebenginecookiestore.qrc
index afeae268b..afeae268b 100644
--- a/tests/auto/core/qwebenginecookiestoreclient/tst_qwebenginecookiestoreclient.qrc
+++ b/tests/auto/core/qwebenginecookiestore/tst_qwebenginecookiestore.qrc
diff --git a/tests/auto/quick/publicapi/tst_publicapi.cpp b/tests/auto/quick/publicapi/tst_publicapi.cpp
index bf0192e42..135d9167f 100644
--- a/tests/auto/quick/publicapi/tst_publicapi.cpp
+++ b/tests/auto/quick/publicapi/tst_publicapi.cpp
@@ -89,7 +89,7 @@ static QStringList hardcodedTypes = QStringList()
     // Ignore the testSupport types without making a fuss.
     << "QQuickWebEngineTestSupport*"
     << "QQuickWebEngineErrorPage*"
-    << "QWebEngineCookieStoreClient*"
+    << "QWebEngineCookieStore*"
     ;
 
 static QStringList expectedAPI = QStringList()
@@ -289,7 +289,7 @@ static QStringList expectedAPI = QStringList()
     << "QQuickWebEngineProfile.httpAcceptLanguageChanged() --> void"
     << "QQuickWebEngineProfile.downloadRequested(QQuickWebEngineDownloadItem*) --> void"
     << "QQuickWebEngineProfile.downloadFinished(QQuickWebEngineDownloadItem*) --> void"
-    << "QQuickWebEngineProfile.setCookieStoreClient(QWebEngineCookieStoreClient*) --> void"
+    << "QQuickWebEngineProfile.setCookieStore(QWebEngineCookieStore*) --> void"
     << "QQuickWebEngineScript.Deferred --> InjectionPoint"
     << "QQuickWebEngineScript.DocumentReady --> InjectionPoint"
     << "QQuickWebEngineScript.DocumentCreation --> InjectionPoint"
diff --git a/tests/quicktestbrowser/main.cpp b/tests/quicktestbrowser/main.cpp
index 167f67dc3..12ebfa2d5 100644
--- a/tests/quicktestbrowser/main.cpp
+++ b/tests/quicktestbrowser/main.cpp
@@ -52,7 +52,7 @@ typedef QGuiApplication Application;
 #include <QtQml/QQmlContext>
 #include <QtQml/QQmlComponent>
 #include <QtWebEngine/qtwebengineglobal.h>
-#include <QtWebEngineCore/qwebenginecookiestoreclient.h>
+#include <QtWebEngineCore/qwebenginecookiestore.h>
 
 static QUrl startupUrl()
 {
@@ -93,12 +93,12 @@ int main(int argc, char **argv)
                       , QUrl());
     QObject *profile = component.create();
     const QMetaObject *rootMeta = rootObject->metaObject();
-    QWebEngineCookieStoreClient *client = 0;
-    QMetaObject::invokeMethod(profile, "cookieStoreClient", Q_RETURN_ARG(QWebEngineCookieStoreClient*, client));
+    QWebEngineCookieStore *client = 0;
+    QMetaObject::invokeMethod(profile, "cookieStore", Q_RETURN_ARG(QWebEngineCookieStore*, client));
     int index = rootMeta->indexOfProperty("thirdPartyCookiesEnabled");
     Q_ASSERT(index != -1);
     QMetaProperty thirdPartyCookiesProperty = rootMeta->property(index);
-    client->setCookieFilter([rootObject,&thirdPartyCookiesProperty](const QWebEngineCookieStoreClient::FilterRequest&){ return thirdPartyCookiesProperty.read(rootObject).toBool(); });
+    client->setCookieFilter([rootObject,&thirdPartyCookiesProperty](const QWebEngineCookieStore::FilterRequest&){ return thirdPartyCookiesProperty.read(rootObject).toBool(); });
 
     index = rootMeta->indexOfProperty("testProfile");
     Q_ASSERT(index != -1);