1 files changed, 18 insertions, 60 deletions

diff --git a/src/core/profile_qt.h b/src/core/profile_qt.h
index 8ad1922df..b5cd08db1 100644
--- a/src/core/profile_qt.h
+++ b/src/core/profile_qt.h
@@ -1,56 +1,20 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 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$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #ifndef PROFILE_QT_H
 #define PROFILE_QT_H
 
 #include "chrome/browser/profiles/profile.h"
-#include "content/public/browser/content_browser_client.h"
-#include "content/public/browser/resource_context.h"
+#include "components/embedder_support/user_agent_utils.h"
 #include "extensions/buildflags/buildflags.h"
 #include "pref_service_adapter.h"
-#include "profile_io_data_qt.h"
-#include <QtGlobal>
 
-class InMemoryPrefStore;
 class PrefService;
 
+namespace content {
+class ResourceContext;
+}
+
 namespace extensions {
 class ExtensionSystemQt;
 }
@@ -58,8 +22,9 @@ class ExtensionSystemQt;
 namespace QtWebEngineCore {
 
 class BrowsingDataRemoverDelegateQt;
-class ProfileAdapter;
 class PermissionManagerQt;
+class ProfileAdapter;
+class ProfileIODataQt;
 class SSLHostStateDelegateQt;
 
 class ProfileQt : public Profile
@@ -89,23 +54,18 @@ public:
     content::BrowsingDataRemoverDelegate *GetBrowsingDataRemoverDelegate() override;
     content::ClientHintsControllerDelegate *GetClientHintsControllerDelegate() override;
     content::StorageNotificationService *GetStorageNotificationService() override;
-    void SetCorsOriginAccessListForOrigin(TargetBrowserContexts target_mode,
-                                          const url::Origin &source_origin,
-                                          std::vector<network::mojom::CorsOriginPatternPtr> allow_patterns,
-                                          std::vector<network::mojom::CorsOriginPatternPtr> block_patterns,
-                                          base::OnceClosure closure) override;
-
-    content::SharedCorsOriginAccessList *GetSharedCorsOriginAccessList() override;
-    std::string GetMediaDeviceIDSalt() override;
+    content::PlatformNotificationService *GetPlatformNotificationService() override;
+    content::FileSystemAccessPermissionContext *GetFileSystemAccessPermissionContext() override;
+    content::ReduceAcceptLanguageControllerDelegate *GetReduceAcceptLanguageControllerDelegate() override;
 
     // Profile implementation:
     PrefService *GetPrefs() override;
     const PrefService *GetPrefs() const override;
+    bool IsNewProfile() const override;
 
-    void Initialize();
+    void DoFinalInit();
     ProfileAdapter *profileAdapter() { return m_profileAdapter; }
-
-    content::PlatformNotificationService *platformNotificationService();
+    std::string GetMediaDeviceIDSalt();
 
 #if QT_CONFIG(webengine_spellchecker)
     void FailedToLoadDictionary(const std::string &language) override;
@@ -119,19 +79,19 @@ public:
     void setupPrefService();
 
     PrefServiceAdapter &prefServiceAdapter();
-
     const PrefServiceAdapter &prefServiceAdapter() const;
-    bool ensureDirectoryExists();
+
+    const blink::UserAgentMetadata &userAgentMetadata();
 
 private:
     std::unique_ptr<BrowsingDataRemoverDelegateQt> m_removerDelegate;
     std::unique_ptr<PermissionManagerQt> m_permissionManager;
     std::unique_ptr<SSLHostStateDelegateQt> m_sslHostStateDelegate;
-    scoped_refptr<content::SharedCorsOriginAccessList> m_sharedCorsOriginAccessList;
     std::unique_ptr<ProfileIODataQt> m_profileIOData;
     std::unique_ptr<content::PlatformNotificationService> m_platformNotificationService;
     ProfileAdapter *m_profileAdapter;
     PrefServiceAdapter m_prefServiceAdapter;
+    blink::UserAgentMetadata m_userAgentMetadata;
 
 #if BUILDFLAG(ENABLE_EXTENSIONS)
     extensions::ExtensionSystemQt *m_extensionSystem;
@@ -139,8 +99,6 @@ private:
 
     friend class ProfileAdapter;
     friend class ProfileIODataQt;
-
-    DISALLOW_COPY_AND_ASSIGN(ProfileQt);
 };
 
 } // namespace QtWebEngineCore