Switch QWebEngineFileSystemAccessRequest to std::shared_ptr

And also inline move constructor

From API review

Pick-to: 6.4
Change-Id: Ieff59c05df9ca7700579a5d83042f5e98355fe74
Reviewed-by: Marc Mutz <marc.mutz@qt.io>

3 files changed, 7 insertions, 10 deletions

diff --git a/src/core/api/qwebenginefilesystemaccessrequest.cpp b/src/core/api/qwebenginefilesystemaccessrequest.cpp
index d2cb1cf7c..e9851909f 100644
--- a/src/core/api/qwebenginefilesystemaccessrequest.cpp
+++ b/src/core/api/qwebenginefilesystemaccessrequest.cpp
@@ -31,8 +31,6 @@ QWebEngineFileSystemAccessRequest::QWebEngineFileSystemAccessRequest(
         const QWebEngineFileSystemAccessRequest &other) = default;
 QWebEngineFileSystemAccessRequest &QWebEngineFileSystemAccessRequest::operator=(
         const QWebEngineFileSystemAccessRequest &other) = default;
-QWebEngineFileSystemAccessRequest::QWebEngineFileSystemAccessRequest(
-        QWebEngineFileSystemAccessRequest &&other) = default;
 QWebEngineFileSystemAccessRequest::~QWebEngineFileSystemAccessRequest() = default;
 
 /*! \fn bool QWebEngineFileSystemAccessRequest::operator==(const QWebEngineFileSystemAccessRequest &that) const
@@ -55,8 +53,8 @@ bool QWebEngineFileSystemAccessRequest::operator!=(
 
 /*! \internal */
 QWebEngineFileSystemAccessRequest::QWebEngineFileSystemAccessRequest(
-        QSharedPointer<QtWebEngineCore::FileSystemAccessPermissionRequestController> controller)
-    : d_ptr(controller)
+        std::shared_ptr<QtWebEngineCore::FileSystemAccessPermissionRequestController> controller)
+    : d_ptr(std::move(controller))
 {
 }
 
diff --git a/src/core/api/qwebenginefilesystemaccessrequest.h b/src/core/api/qwebenginefilesystemaccessrequest.h
index d53cb4ec5..67912f7ef 100644
--- a/src/core/api/qwebenginefilesystemaccessrequest.h
+++ b/src/core/api/qwebenginefilesystemaccessrequest.h
@@ -5,9 +5,8 @@
 #define QWEBENGINEFILESYSTEMACCESSREQUEST_H
 
 #include <QtWebEngineCore/qtwebenginecoreglobal.h>
-
-#include <QtCore/qsharedpointer.h>
 #include <QtCore/qurl.h>
+#include <memory>
 
 namespace QtWebEngineCore {
 class FileSystemAccessPermissionRequestController;
@@ -27,7 +26,7 @@ class Q_WEBENGINECORE_EXPORT QWebEngineFileSystemAccessRequest
 public:
     QWebEngineFileSystemAccessRequest(const QWebEngineFileSystemAccessRequest &other);
     QWebEngineFileSystemAccessRequest &operator=(const QWebEngineFileSystemAccessRequest &other);
-    QWebEngineFileSystemAccessRequest(QWebEngineFileSystemAccessRequest &&other);
+    QWebEngineFileSystemAccessRequest(QWebEngineFileSystemAccessRequest &&other) noexcept = default;
     QT_MOVE_ASSIGNMENT_OPERATOR_IMPL_VIA_PURE_SWAP(QWebEngineFileSystemAccessRequest)
     ~QWebEngineFileSystemAccessRequest();
 
@@ -52,10 +51,10 @@ public:
 
 private:
     QWebEngineFileSystemAccessRequest(
-            QSharedPointer<QtWebEngineCore::FileSystemAccessPermissionRequestController>);
+            std::shared_ptr<QtWebEngineCore::FileSystemAccessPermissionRequestController>);
     friend QtWebEngineCore::FileSystemAccessPermissionRequestManagerQt;
 
-    QSharedPointer<QtWebEngineCore::FileSystemAccessPermissionRequestController> d_ptr;
+    std::shared_ptr<QtWebEngineCore::FileSystemAccessPermissionRequestController> d_ptr;
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QWebEngineFileSystemAccessRequest::AccessFlags)
diff --git a/src/core/file_system_access/file_system_access_permission_request_manager_qt.cpp b/src/core/file_system_access/file_system_access_permission_request_manager_qt.cpp
index 17d7f3405..423cdd777 100644
--- a/src/core/file_system_access/file_system_access_permission_request_manager_qt.cpp
+++ b/src/core/file_system_access/file_system_access_permission_request_manager_qt.cpp
@@ -127,7 +127,7 @@ void FileSystemAccessPermissionRequestManagerQt::DequeueAndShowRequest()
     }
 
     QWebEngineFileSystemAccessRequest request(
-            QSharedPointer<FileSystemAccessPermissionRequestControllerImpl>::create(
+            std::make_shared<FileSystemAccessPermissionRequestControllerImpl>(
                     m_currentRequest->data,
                     base::BindOnce(
                             &FileSystemAccessPermissionRequestManagerQt::OnPermissionDialogResult,