Tie client certificate stores to profiles

Move the client certificate store from being global to being tied
to individual profiles.

Change-Id: Ib21ae14c501b7d0612b84ae7535120291aeeada2
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>

1 files changed, 5 insertions, 7 deletions

diff --git a/src/core/api/qwebengineclientcertificatestore.h b/src/core/api/qwebengineclientcertificatestore.h
index 0000299a2..441a5f913 100644
--- a/src/core/api/qwebengineclientcertificatestore.h
+++ b/src/core/api/qwebengineclientcertificatestore.h
@@ -47,15 +47,15 @@
 #include <QtNetwork/qsslkey.h>
 
 namespace QtWebEngineCore {
-class ClientCertOverrideStore;
 struct ClientCertificateStoreData;
+class ProfileAdapter;
 }
 
 QT_BEGIN_NAMESPACE
 
 #if QT_CONFIG(ssl)
 
-
+class QWebEngineProfile;
 class QWEBENGINECORE_EXPORT QWebEngineClientCertificateStore {
 
 public:
@@ -64,20 +64,18 @@ public:
         QSslCertificate certificate;
     };
 
-    static QWebEngineClientCertificateStore *getInstance();
     void add(const QSslCertificate &certificate, const QSslKey &privateKey);
     QList<Entry> toList() const;
     void remove(const QSslCertificate &certificate);
     void clear();
 
 private:
-    friend class QtWebEngineCore::ClientCertOverrideStore;
-    static QWebEngineClientCertificateStore *m_instance;
+    friend class QtWebEngineCore::ProfileAdapter;
     Q_DISABLE_COPY(QWebEngineClientCertificateStore)
 
-    QWebEngineClientCertificateStore();
+    QWebEngineClientCertificateStore(QtWebEngineCore::ClientCertificateStoreData *storeData);
     ~QWebEngineClientCertificateStore();
-    QScopedPointer<QtWebEngineCore::ClientCertificateStoreData> d_ptr;
+    QtWebEngineCore::ClientCertificateStoreData *m_storeData;
 };
 
 #endif // QT_CONFIG(ssl)