6 files changed, 19 insertions, 19 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