Move client certificate selection to core

[ChangeLog] QWebEngineClientCertificateSelection is in QtWebEngineCore

Task-number: QTBUG-74585
Change-Id: I35aab40a15b4c29bdc8c291fe7920158140e70b2
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

3 files changed, 1 insertions, 204 deletions

diff --git a/src/webenginewidgets/api/qwebengineclientcertificateselection.cpp b/src/webenginewidgets/api/qwebengineclientcertificateselection.cpp
deleted file mode 100644
index febfe0a21..000000000
--- a/src/webenginewidgets/api/qwebengineclientcertificateselection.cpp
+++ /dev/null
@@ -1,124 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qwebengineclientcertificateselection.h"
-#include "client_cert_select_controller.h"
-
-QT_BEGIN_NAMESPACE
-
-/*!
-    \class QWebEngineClientCertificateSelection
-    \brief The QWebEngineClientCertSelection class wraps a client certificate selection.
-    \since 5.12
-    \inmodule QtWebEngineWidgets
-
-    When a web site requests an SSL client certificate, and one or more certificates
-    are found in the system's client certificate store, this class provides access to
-    the certificates to choose from, as well as a method for selecting one.
-
-    The selection is asynchronous. If no certificate is selected and no copy of the
-    object is kept alive, loading will continue without a certificate.
-
-    \sa QWebEnginePage::selectClientCertificate()
-*/
-
-/*! \internal
-*/
-QWebEngineClientCertificateSelection::QWebEngineClientCertificateSelection(
-        QSharedPointer<QtWebEngineCore::ClientCertSelectController> selectController)
-    : d_ptr(selectController)
-{}
-
-QWebEngineClientCertificateSelection::QWebEngineClientCertificateSelection(const QWebEngineClientCertificateSelection &other)
-        : d_ptr(other.d_ptr)
-{}
-
-QWebEngineClientCertificateSelection &QWebEngineClientCertificateSelection::operator=(const QWebEngineClientCertificateSelection &other)
-{
-    d_ptr = other.d_ptr;
-    return *this;
-}
-
-QWebEngineClientCertificateSelection::~QWebEngineClientCertificateSelection()
-{
-}
-
-/*!
-    Returns the client certificates available to choose from.
-
-    \sa select()
-*/
-QList<QSslCertificate> QWebEngineClientCertificateSelection::certificates() const
-{
-    return d_ptr->certificates();
-}
-
-/*!
-    Selects the client certificate \a certificate. The certificate must be one
-    of those offered in certificates().
-
-    \sa certificates(), selectNone()
-*/
-void QWebEngineClientCertificateSelection::select(const QSslCertificate &certificate)
-{
-    d_ptr->select(certificate);
-}
-
-/*!
-    Continue without using any of the offered certificates. This is the same
-    action as taken when destroying the last copy of this object if no
-    selection has been made.
-
-    \sa select()
-*/
-void QWebEngineClientCertificateSelection::selectNone()
-{
-    d_ptr->selectNone();
-}
-
-/*!
-    Returns the host and port of the server requesting the client certificate.
-*/
-QUrl QWebEngineClientCertificateSelection::host() const
-{
-    return d_ptr->hostAndPort();
-}
-
-QT_END_NAMESPACE
-
diff --git a/src/webenginewidgets/api/qwebengineclientcertificateselection.h b/src/webenginewidgets/api/qwebengineclientcertificateselection.h
deleted file mode 100644
index 165194aac..000000000
--- a/src/webenginewidgets/api/qwebengineclientcertificateselection.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QWEBENGINECLIENTCERTSELECTION_H
-#define QWEBENGINECLIENTCERTSELECTION_H
-
-#include <QtWebEngineWidgets/qtwebenginewidgetsglobal.h>
-#include <QtNetwork/qtnetwork-config.h>
-#include <QtCore/qlist.h>
-#include <QtCore/qscopedpointer.h>
-#include <QtNetwork/qsslcertificate.h>
-
-namespace QtWebEngineCore {
-class ClientCertSelectController;
-}
-
-QT_BEGIN_NAMESPACE
-
-class QWEBENGINEWIDGETS_EXPORT QWebEngineClientCertificateSelection {
-public:
-    QWebEngineClientCertificateSelection(const QWebEngineClientCertificateSelection &);
-    ~QWebEngineClientCertificateSelection();
-
-    QWebEngineClientCertificateSelection &operator=(const QWebEngineClientCertificateSelection &);
-
-    QUrl host() const;
-
-    void select(const QSslCertificate &certificate);
-    void selectNone();
-    QList<QSslCertificate> certificates() const;
-
-private:
-    friend class QWebEnginePagePrivate;
-
-    QWebEngineClientCertificateSelection(
-            QSharedPointer<QtWebEngineCore::ClientCertSelectController>);
-
-    QSharedPointer<QtWebEngineCore::ClientCertSelectController> d_ptr;
-};
-
-QT_END_NAMESPACE
-
-#endif // QWEBENGINECLIENTCERTSELECTION_H
diff --git a/src/webenginewidgets/api/qwebenginepage.h b/src/webenginewidgets/api/qwebenginepage.h
index f842a5eb1..b0b447c22 100644
--- a/src/webenginewidgets/api/qwebenginepage.h
+++ b/src/webenginewidgets/api/qwebenginepage.h
@@ -41,7 +41,7 @@
 #define QWEBENGINEPAGE_H
 
 #include <QtWebEngineWidgets/qtwebenginewidgetsglobal.h>
-#include <QtWebEngineWidgets/qwebengineclientcertificateselection.h>
+#include <QtWebEngineCore/qwebengineclientcertificateselection.h>
 #include <QtWebEngineCore/qwebenginedownloadrequest.h>
 #include <QtWebEngineCore/qwebenginecallback.h>
 #include <QtWebEngineCore/qwebenginehttprequest.h>