Rename BrowserContextQt to ProfileQt

Following commits are going to introduce
ProfileIODataQt and to keep things self documented
just rename the class so it reflects Chromium one.
Fix minor style issues in profile_qt.h

Presort include headers as requested on review.

Change-Id: If58f5aec8ac64cfaf30642195838a77497b75244
Reviewed-by: Kai Koehne <kai.koehne@qt.io>

16 files changed, 91 insertions, 88 deletions

diff --git a/src/core/browser_context_adapter.cpp b/src/core/browser_context_adapter.cpp
index 2b12b8bd3..4db9ec8b9 100644
--- a/src/core/browser_context_adapter.cpp
+++ b/src/core/browser_context_adapter.cpp
@@ -44,11 +44,11 @@
 #include "content/public/browser/browsing_data_remover.h"
 #include "content/public/browser/download_manager.h"
 
-#include "browser_context_qt.h"
 #include "content_client_qt.h"
 #include "download_manager_delegate_qt.h"
 #include "net/url_request_context_getter_qt.h"
 #include "permission_manager_qt.h"
+#include "profile_qt.h"
 #include "renderer_host/user_resource_controller_host.h"
 #include "type_conversion.h"
 #include "visited_links_manager_qt.h"
@@ -78,7 +78,7 @@ namespace QtWebEngineCore {
 
 BrowserContextAdapter::BrowserContextAdapter(bool offTheRecord):
       m_offTheRecord(offTheRecord)
-    , m_browserContext(new BrowserContextQt(this))
+    , m_browserContext(new ProfileQt(this))
     , m_httpCacheType(DiskHttpCache)
     , m_persistentCookiesPolicy(AllowPersistentCookies)
     , m_visitedLinksPolicy(TrackVisitedLinksOnDisk)
@@ -96,7 +96,7 @@ BrowserContextAdapter::BrowserContextAdapter(bool offTheRecord):
 BrowserContextAdapter::BrowserContextAdapter(const QString &storageName):
       m_name(storageName)
     , m_offTheRecord(false)
-    , m_browserContext(new BrowserContextQt(this))
+    , m_browserContext(new ProfileQt(this))
     , m_httpCacheType(DiskHttpCache)
     , m_persistentCookiesPolicy(AllowPersistentCookies)
     , m_visitedLinksPolicy(TrackVisitedLinksOnDisk)
@@ -146,7 +146,7 @@ void BrowserContextAdapter::setOffTheRecord(bool offTheRecord)
         resetVisitedLinksManager();
 }
 
-BrowserContextQt *BrowserContextAdapter::browserContext()
+ProfileQt *BrowserContextAdapter::browserContext()
 {
     return m_browserContext.data();
 }
diff --git a/src/core/browser_context_adapter.h b/src/core/browser_context_adapter.h
index e13c62a38..76d4f73c0 100644
--- a/src/core/browser_context_adapter.h
+++ b/src/core/browser_context_adapter.h
@@ -58,8 +58,8 @@ QT_FORWARD_DECLARE_CLASS(QObject)
 namespace QtWebEngineCore {
 
 class BrowserContextAdapterClient;
-class BrowserContextQt;
 class DownloadManagerDelegateQt;
+class ProfileQt;
 class UserResourceControllerHost;
 class VisitedLinksManagerQt;
 
@@ -89,7 +89,7 @@ public:
     void pauseDownload(quint32 downloadId);
     void resumeDownload(quint32 downloadId);
 
-    BrowserContextQt *browserContext();
+    ProfileQt *browserContext();
 
     QString storageName() const { return m_name; }
     void setStorageName(const QString &storageName);
@@ -181,7 +181,7 @@ private:
 
     QString m_name;
     bool m_offTheRecord;
-    QScopedPointer<BrowserContextQt> m_browserContext;
+    QScopedPointer<ProfileQt> m_browserContext;
     QScopedPointer<VisitedLinksManagerQt> m_visitedLinksManager;
     QScopedPointer<DownloadManagerDelegateQt> m_downloadManagerDelegate;
     QScopedPointer<UserResourceControllerHost> m_userResourceController;
diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp
index aa13cce3a..0a83ceacd 100644
--- a/src/core/content_browser_client_qt.cpp
+++ b/src/core/content_browser_client_qt.cpp
@@ -88,7 +88,6 @@
 #include "qtwebengine/grit/qt_webengine_resources.h"
 
 #include "browser_context_adapter.h"
-#include "browser_context_qt.h"
 #include "browser_message_filter_qt.h"
 #include "certificate_error_controller.h"
 #include "certificate_error_controller_p.h"
@@ -101,6 +100,7 @@
 #if BUILDFLAG(ENABLE_BASIC_PRINTING)
 #include "printing/printing_message_filter_qt.h"
 #endif // BUILDFLAG(ENABLE_BASIC_PRINTING)
+#include "profile_qt.h"
 #include "quota_permission_context_qt.h"
 #include "renderer_host/resource_dispatcher_host_delegate_qt.h"
 #include "renderer_host/user_resource_controller_host.h"
@@ -390,7 +390,7 @@ void ContentBrowserClientQt::RenderProcessWillLaunch(content::RenderProcessHost*
     Profile *profile = Profile::FromBrowserContext(host->GetBrowserContext());
     // FIXME: Add a settings variable to enable/disable the file scheme.
     content::ChildProcessSecurityPolicy::GetInstance()->GrantScheme(id, url::kFileScheme);
-    static_cast<BrowserContextQt*>(host->GetBrowserContext())->m_adapter->userResourceController()->renderProcessStartedWithHost(host);
+    static_cast<ProfileQt*>(host->GetBrowserContext())->m_adapter->userResourceController()->renderProcessStartedWithHost(host);
     host->AddFilter(new BrowserMessageFilterQt(id, profile));
 #if defined(Q_OS_MACOS) && BUILDFLAG(ENABLE_SPELLCHECK) && BUILDFLAG(USE_BROWSER_SPELLCHECKER)
   host->AddFilter(new SpellCheckMessageFilterPlatform(id));
@@ -503,7 +503,7 @@ std::string ContentBrowserClientQt::GetApplicationLocale()
 
 std::string ContentBrowserClientQt::GetAcceptLangs(content::BrowserContext *context)
 {
-    return static_cast<BrowserContextQt*>(context)->adapter()->httpAcceptLanguage().toStdString();
+    return static_cast<ProfileQt*>(context)->adapter()->httpAcceptLanguage().toStdString();
 }
 
 void ContentBrowserClientQt::AppendExtraCommandLineSwitches(base::CommandLine* command_line, int child_process_id)
diff --git a/src/core/content_browser_client_qt.h b/src/core/content_browser_client_qt.h
index 515574147..8c7079e62 100644
--- a/src/core/content_browser_client_qt.h
+++ b/src/core/content_browser_client_qt.h
@@ -74,8 +74,9 @@ class GLShareGroup;
 }
 
 namespace QtWebEngineCore {
-class BrowserContextQt;
+
 class BrowserMainPartsQt;
+class ProfileQt;
 class ResourceDispatcherHostDelegateQt;
 class ShareGroupQtQuick;
 
diff --git a/src/core/core_chromium.pri b/src/core/core_chromium.pri
index d036f82fd..31dbd7586 100644
--- a/src/core/core_chromium.pri
+++ b/src/core/core_chromium.pri
@@ -40,7 +40,6 @@ SOURCES = \
         browser_accessibility_qt.cpp \
         browser_context_adapter.cpp \
         browser_context_adapter_client.cpp \
-        browser_context_qt.cpp \
         browsing_data_remover_delegate_qt.cpp \
         browser_message_filter_qt.cpp \
         certificate_error_controller.cpp \
@@ -89,6 +88,7 @@ SOURCES = \
         ozone/surface_factory_qt.cpp \
         permission_manager_qt.cpp \
         process_main.cpp \
+        profile_qt.cpp \
         quota_permission_context_qt.cpp \
         quota_request_controller_impl.cpp \
         register_protocol_handler_request_controller_impl.cpp \
@@ -125,7 +125,6 @@ HEADERS = \
         browser_accessibility_qt.h \
         browser_context_adapter.h \
         browser_context_adapter_client.h \
-        browser_context_qt.h \
         browsing_data_remover_delegate_qt.h \
         browser_message_filter_qt.h \
         certificate_error_controller_p.h \
@@ -175,6 +174,7 @@ HEADERS = \
         ozone/surface_factory_qt.h \
         permission_manager_qt.h \
         process_main.h \
+        profile_qt.h \
         proxy_config_service_qt.h \
         quota_permission_context_qt.h \
         quota_request_controller.h \
diff --git a/src/core/devtools_frontend_qt.cpp b/src/core/devtools_frontend_qt.cpp
index 810235dba..0dd468240 100644
--- a/src/core/devtools_frontend_qt.cpp
+++ b/src/core/devtools_frontend_qt.cpp
@@ -45,7 +45,7 @@
 #include "devtools_frontend_qt.h"
 
 #include "browser_context_adapter.h"
-#include "browser_context_qt.h"
+#include "profile_qt.h"
 #include "web_contents_adapter.h"
 
 #include "base/json/json_reader.h"
@@ -189,7 +189,7 @@ DevToolsFrontendQt::DevToolsFrontendQt(QSharedPointer<WebContentsAdapter> webCon
     , m_prefStore(nullptr)
     , m_weakFactory(this)
 {
-    // We use a separate prefstore than BrowserContextQt, because that one is in-memory only, and this
+    // We use a separate prefstore than one in ProfileQt, because that one is in-memory only, and this
     // needs to be stored or it will show introduction text on every load.
     if (webContentsAdapter->browserContextAdapter()->isOffTheRecord())
         m_prefStore = std::move(scoped_refptr<PersistentPrefStore>(new InMemoryPrefStore()));
diff --git a/src/core/download_manager_delegate_qt.cpp b/src/core/download_manager_delegate_qt.cpp
index 487a831e4..5a5e5b79d 100644
--- a/src/core/download_manager_delegate_qt.cpp
+++ b/src/core/download_manager_delegate_qt.cpp
@@ -52,12 +52,12 @@
 #include <QMimeDatabase>
 #include <QStandardPaths>
 
-#include "browser_context_adapter.h"
 #include "browser_context_adapter_client.h"
-#include "browser_context_qt.h"
+#include "browser_context_adapter.h"
+#include "profile_qt.h"
+#include "qtwebenginecoreglobal.h"
 #include "type_conversion.h"
 #include "web_contents_delegate_qt.h"
-#include "qtwebenginecoreglobal.h"
 
 namespace QtWebEngineCore {
 
diff --git a/src/core/net/url_request_context_getter_qt.cpp b/src/core/net/url_request_context_getter_qt.cpp
index 89c048d18..56b31c7fa 100644
--- a/src/core/net/url_request_context_getter_qt.cpp
+++ b/src/core/net/url_request_context_getter_qt.cpp
@@ -78,8 +78,8 @@
 #include "net/ftp/ftp_network_layer.h"
 
 #include "api/qwebengineurlschemehandler.h"
-#include "browser_context_qt.h"
 #include "custom_protocol_handler.h"
+#include "profile_qt.h"
 #include "proxy_config_service_qt.h"
 #include "qrc_protocol_handler_qt.h"
 #include "qwebenginecookiestore.h"
diff --git a/src/core/browser_context_qt.cpp b/src/core/profile_qt.cpp
index 32dbe0666..75ba69e01 100644
--- a/src/core/browser_context_qt.cpp
+++ b/src/core/profile_qt.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "browser_context_qt.h"
+#include "profile_qt.h"
 
 #include "browser_context_adapter.h"
 #include "browsing_data_remover_delegate_qt.h"
@@ -71,7 +71,7 @@
 
 namespace QtWebEngineCore {
 
-BrowserContextQt::BrowserContextQt(BrowserContextAdapter *adapter)
+ProfileQt::ProfileQt(BrowserContextAdapter *adapter)
     : m_adapter(adapter)
 {
     PrefServiceFactory factory;
@@ -91,111 +91,111 @@ BrowserContextQt::BrowserContextQt(BrowserContextAdapter *adapter)
     user_prefs::UserPrefs::Set(this, m_prefService.get());
 }
 
-BrowserContextQt::~BrowserContextQt()
+ProfileQt::~ProfileQt()
 {
     if (resourceContext)
         content::BrowserThread::DeleteSoon(content::BrowserThread::IO, FROM_HERE, resourceContext.release());
 }
 
-PrefService* BrowserContextQt::GetPrefs()
+PrefService* ProfileQt::GetPrefs()
 {
     return m_prefService.get();
 }
 
-const PrefService* BrowserContextQt::GetPrefs() const
+const PrefService* ProfileQt::GetPrefs() const
 {
     return m_prefService.get();
 }
 
-base::FilePath BrowserContextQt::GetPath() const
+base::FilePath ProfileQt::GetPath() const
 {
     return toFilePath(m_adapter->dataPath());
 }
 
-bool BrowserContextQt::IsOffTheRecord() const
+bool ProfileQt::IsOffTheRecord() const
 {
     return m_adapter->isOffTheRecord();
 }
 
-net::URLRequestContextGetter *BrowserContextQt::GetRequestContext()
+net::URLRequestContextGetter *ProfileQt::GetRequestContext()
 {
     return url_request_getter_.get();
 }
 
-net::URLRequestContextGetter *BrowserContextQt::CreateMediaRequestContext()
+net::URLRequestContextGetter *ProfileQt::CreateMediaRequestContext()
 {
     return url_request_getter_.get();
 }
 
-net::URLRequestContextGetter *BrowserContextQt::CreateMediaRequestContextForStoragePartition(const base::FilePath&, bool)
+net::URLRequestContextGetter *ProfileQt::CreateMediaRequestContextForStoragePartition(const base::FilePath&, bool)
 {
     Q_UNIMPLEMENTED();
     return nullptr;
 }
 
-content::ResourceContext *BrowserContextQt::GetResourceContext()
+content::ResourceContext *ProfileQt::GetResourceContext()
 {
     if (!resourceContext)
         resourceContext.reset(new ResourceContextQt(this));
     return resourceContext.get();
 }
 
-content::DownloadManagerDelegate *BrowserContextQt::GetDownloadManagerDelegate()
+content::DownloadManagerDelegate *ProfileQt::GetDownloadManagerDelegate()
 {
     return m_adapter->downloadManagerDelegate();
 }
 
-content::BrowserPluginGuestManager *BrowserContextQt::GetGuestManager()
+content::BrowserPluginGuestManager *ProfileQt::GetGuestManager()
 {
     return 0;
 }
 
-storage::SpecialStoragePolicy *BrowserContextQt::GetSpecialStoragePolicy()
+storage::SpecialStoragePolicy *ProfileQt::GetSpecialStoragePolicy()
 {
     QT_NOT_YET_IMPLEMENTED
     return 0;
 }
 
-content::PushMessagingService *BrowserContextQt::GetPushMessagingService()
+content::PushMessagingService *ProfileQt::GetPushMessagingService()
 {
     return 0;
 }
 
-content::SSLHostStateDelegate* BrowserContextQt::GetSSLHostStateDelegate()
+content::SSLHostStateDelegate* ProfileQt::GetSSLHostStateDelegate()
 {
     if (!sslHostStateDelegate)
         sslHostStateDelegate.reset(new SSLHostStateDelegateQt());
     return sslHostStateDelegate.get();
 }
 
-std::unique_ptr<content::ZoomLevelDelegate> BrowserContextQt::CreateZoomLevelDelegate(const base::FilePath&)
+std::unique_ptr<content::ZoomLevelDelegate> ProfileQt::CreateZoomLevelDelegate(const base::FilePath&)
 {
     return nullptr;
 }
 
-content::BackgroundFetchDelegate* BrowserContextQt::GetBackgroundFetchDelegate()
+content::BackgroundFetchDelegate* ProfileQt::GetBackgroundFetchDelegate()
 {
     return nullptr;
 }
 
-content::BackgroundSyncController* BrowserContextQt::GetBackgroundSyncController()
+content::BackgroundSyncController* ProfileQt::GetBackgroundSyncController()
 {
     return nullptr;
 }
 
-content::BrowsingDataRemoverDelegate *BrowserContextQt::GetBrowsingDataRemoverDelegate()
+content::BrowsingDataRemoverDelegate *ProfileQt::GetBrowsingDataRemoverDelegate()
 {
     return new BrowsingDataRemoverDelegateQt;
 }
 
-content::PermissionManager *BrowserContextQt::GetPermissionManager()
+content::PermissionManager *ProfileQt::GetPermissionManager()
 {
     if (!permissionManager)
         permissionManager.reset(new PermissionManagerQt());
     return permissionManager.get();
 }
 
-net::URLRequestContextGetter *BrowserContextQt::CreateRequestContext(
+net::URLRequestContextGetter *ProfileQt::CreateRequestContext(
         content::ProtocolHandlerMap *protocol_handlers,
         content::URLRequestInterceptorScopedVector request_interceptors)
 {
@@ -204,7 +204,7 @@ net::URLRequestContextGetter *BrowserContextQt::CreateRequestContext(
     return url_request_getter_.get();
 }
 
-net::URLRequestContextGetter *BrowserContextQt::CreateRequestContextForStoragePartition(
+net::URLRequestContextGetter *ProfileQt::CreateRequestContextForStoragePartition(
         const base::FilePath& partition_path, bool in_memory,
         content::ProtocolHandlerMap* protocol_handlers,
         content::URLRequestInterceptorScopedVector request_interceptors)
@@ -214,14 +214,14 @@ net::URLRequestContextGetter *BrowserContextQt::CreateRequestContextForStoragePa
 }
 
 #if BUILDFLAG(ENABLE_SPELLCHECK)
-void BrowserContextQt::FailedToLoadDictionary(const std::string &language)
+void ProfileQt::FailedToLoadDictionary(const std::string &language)
 {
     Q_ASSERT(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
     qWarning() << "Could not load dictionary for:" << toQt(language) << endl
                << "Make sure that correct bdic file is in:" << toQt(WebEngineLibraryInfo::getPath(base::DIR_APP_DICTIONARIES).value());
 }
 
-void BrowserContextQt::setSpellCheckLanguages(const QStringList &languages)
+void ProfileQt::setSpellCheckLanguages(const QStringList &languages)
 {
     StringListPrefMember dictionaries_pref;
     dictionaries_pref.Init(spellcheck::prefs::kSpellCheckDictionaries, m_prefService.get());
@@ -232,7 +232,7 @@ void BrowserContextQt::setSpellCheckLanguages(const QStringList &languages)
     dictionaries_pref.SetValue(dictionaries);
 }
 
-QStringList BrowserContextQt::spellCheckLanguages() const
+QStringList ProfileQt::spellCheckLanguages() const
 {
     QStringList spellcheck_dictionaries;
     for (const auto &value : *m_prefService->GetList(spellcheck::prefs::kSpellCheckDictionaries)) {
@@ -244,12 +244,12 @@ QStringList BrowserContextQt::spellCheckLanguages() const
     return spellcheck_dictionaries;
 }
 
-void BrowserContextQt::setSpellCheckEnabled(bool enabled)
+void ProfileQt::setSpellCheckEnabled(bool enabled)
 {
     m_prefService->SetBoolean(spellcheck::prefs::kSpellCheckEnable, enabled);
 }
 
-bool BrowserContextQt::isSpellCheckEnabled() const
+bool ProfileQt::isSpellCheckEnabled() const
 {
     return m_prefService->GetBoolean(spellcheck::prefs::kSpellCheckEnable);
 }
diff --git a/src/core/browser_context_qt.h b/src/core/profile_qt.h
index 7fef34df2..fdcdf9e8a 100644
--- a/src/core/browser_context_qt.h
+++ b/src/core/profile_qt.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef BROWSER_CONTEXT_QT_H
-#define BROWSER_CONTEXT_QT_H
+#ifndef PROFILE_QT_H
+#define PROFILE_QT_H
 
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/content_browser_client.h"
@@ -60,48 +60,50 @@ class PermissionManagerQt;
 class SSLHostStateDelegateQt;
 class URLRequestContextGetterQt;
 
-class BrowserContextQt : public Profile
+class ProfileQt : public Profile
 {
 public:
-    explicit BrowserContextQt(BrowserContextAdapter *);
+    explicit ProfileQt(BrowserContextAdapter *);
 
-    virtual ~BrowserContextQt();
+    virtual ~ProfileQt();
 
     // BrowserContext implementation:
     base::FilePath GetPath() const override;
     bool IsOffTheRecord() const override;
 
     net::URLRequestContextGetter *CreateMediaRequestContext() override;
-    net::URLRequestContextGetter *CreateMediaRequestContextForStoragePartition(const base::FilePath& partition_path, bool in_memory) override;
-
+    net::URLRequestContextGetter *CreateMediaRequestContextForStoragePartition(
+            const base::FilePath &partition_path,
+            bool in_memory) override;
     content::ResourceContext *GetResourceContext() override;
     content::DownloadManagerDelegate *GetDownloadManagerDelegate() override;
-    content::BrowserPluginGuestManager* GetGuestManager() override;
+    content::BrowserPluginGuestManager *GetGuestManager() override;
     storage::SpecialStoragePolicy *GetSpecialStoragePolicy() override;
-    content::PushMessagingService* GetPushMessagingService() override;
-    content::SSLHostStateDelegate* GetSSLHostStateDelegate() override;
+    content::PushMessagingService *GetPushMessagingService() override;
+    content::SSLHostStateDelegate *GetSSLHostStateDelegate() override;
     net::URLRequestContextGetter *CreateRequestContext(
             content::ProtocolHandlerMap *protocol_handlers,
             content::URLRequestInterceptorScopedVector request_interceptors) override;
-    net::URLRequestContextGetter* CreateRequestContextForStoragePartition(
-            const base::FilePath& partition_path, bool in_memory,
-            content::ProtocolHandlerMap* protocol_handlers,
+    net::URLRequestContextGetter *CreateRequestContextForStoragePartition(
+            const base::FilePath &partition_path, bool in_memory,
+            content::ProtocolHandlerMap *protocol_handlers,
             content::URLRequestInterceptorScopedVector request_interceptors) override;
-    std::unique_ptr<content::ZoomLevelDelegate> CreateZoomLevelDelegate(const base::FilePath& partition_path) override;
+    std::unique_ptr<content::ZoomLevelDelegate> CreateZoomLevelDelegate(
+            const base::FilePath &partition_path) override;
     content::PermissionManager *GetPermissionManager() override;
-    content::BackgroundFetchDelegate* GetBackgroundFetchDelegate() override;
-    content::BackgroundSyncController* GetBackgroundSyncController() override;
+    content::BackgroundFetchDelegate *GetBackgroundFetchDelegate() override;
+    content::BackgroundSyncController *GetBackgroundSyncController() override;
     content::BrowsingDataRemoverDelegate *GetBrowsingDataRemoverDelegate() override;
 
     // Profile implementation:
-    PrefService* GetPrefs() override;
-    const PrefService* GetPrefs() const override;
+    PrefService *GetPrefs() override;
+    const PrefService *GetPrefs() const override;
     net::URLRequestContextGetter *GetRequestContext() override;
 
     BrowserContextAdapter *adapter() { return m_adapter; }
 
 #if BUILDFLAG(ENABLE_SPELLCHECK)
-    void FailedToLoadDictionary(const std::string& language) override;
+    void FailedToLoadDictionary(const std::string &language) override;
     void setSpellCheckLanguages(const QStringList &languages);
     QStringList spellCheckLanguages() const;
     void setSpellCheckEnabled(bool enabled);
@@ -119,9 +121,9 @@ private:
     std::unique_ptr<PrefService> m_prefService;
     friend class BrowserContextAdapter;
 
-    DISALLOW_COPY_AND_ASSIGN(BrowserContextQt);
+    DISALLOW_COPY_AND_ASSIGN(ProfileQt);
 };
 
 } // namespace QtWebEngineCore
 
-#endif // BROWSER_CONTEXT_QT_H
+#endif // PROFILE_QT_H
diff --git a/src/core/resource_context_qt.cpp b/src/core/resource_context_qt.cpp
index 1ab1ea223..a906d74c0 100644
--- a/src/core/resource_context_qt.cpp
+++ b/src/core/resource_context_qt.cpp
@@ -42,7 +42,7 @@
 #include "content/public/browser/storage_partition.h"
 #include "net/url_request/url_request_context_getter.h"
 
-#include "browser_context_qt.h"
+#include "profile_qt.h"
 
 namespace QtWebEngineCore {
 
diff --git a/src/core/resource_context_qt.h b/src/core/resource_context_qt.h
index 62452b449..edbba4e0f 100644
--- a/src/core/resource_context_qt.h
+++ b/src/core/resource_context_qt.h
@@ -49,12 +49,12 @@ class URLRequestContextGetter;
 class GURL;
 
 namespace QtWebEngineCore {
-class BrowserContextQt;
+class ProfileQt;
 
 class ResourceContextQt : public content::ResourceContext
 {
 public:
-    ResourceContextQt(BrowserContextQt *ctx)
+    ResourceContextQt(ProfileQt *ctx)
         : context(ctx)
     {}
 
@@ -62,7 +62,7 @@ public:
     net::URLRequestContext *GetRequestContext() override;
 
 private:
-    BrowserContextQt *context;
+    ProfileQt *context;
 
     DISALLOW_COPY_AND_ASSIGN(ResourceContextQt);
 };
diff --git a/src/core/visited_links_manager_qt.cpp b/src/core/visited_links_manager_qt.cpp
index 5e9a89338..d5e2d6f40 100644
--- a/src/core/visited_links_manager_qt.cpp
+++ b/src/core/visited_links_manager_qt.cpp
@@ -40,8 +40,8 @@
 #include "visited_links_manager_qt.h"
 
 #include "browser_context_adapter.h"
-#include "browser_context_qt.h"
 #include "content_browser_client_qt.h"
+#include "profile_qt.h"
 #include "type_conversion.h"
 
 #include <base/files/file_util.h>
@@ -110,7 +110,7 @@ VisitedLinksManagerQt::VisitedLinksManagerQt(BrowserContextAdapter *adapter)
     : m_delegate(new VisitedLinkDelegateQt)
 {
     Q_ASSERT(adapter && adapter->browserContext());
-    BrowserContextQt *browserContext = adapter->browserContext();
+    ProfileQt *browserContext = adapter->browserContext();
     if (adapter->persistVisitedLinks())
         ensureDirectoryExists(browserContext->GetPath());
     m_visitedLinkMaster.reset(new visitedlink::VisitedLinkMaster(browserContext, m_delegate.data(), adapter->persistVisitedLinks()));
diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp
index c7d36cb67..1c5eb2535 100644
--- a/src/core/web_contents_adapter.cpp
+++ b/src/core/web_contents_adapter.cpp
@@ -44,13 +44,13 @@
 #include "web_contents_adapter.h"
 
 #include "browser_accessibility_qt.h"
-#include "browser_context_adapter.h"
 #include "browser_context_adapter_client.h"
-#include "browser_context_qt.h"
+#include "browser_context_adapter.h"
 #include "devtools_frontend_qt.h"
 #include "download_manager_delegate_qt.h"
 #include "media_capture_devices_dispatcher.h"
 #include "printing/print_view_manager_qt.h"
+#include "profile_qt.h"
 #include "qwebenginecallback_p.h"
 #include "renderer_host/web_channel_ipc_transport_host.h"
 #include "render_view_observer_host_qt.h"
@@ -884,16 +884,16 @@ qreal WebContentsAdapter::currentZoomFactor() const
     return content::ZoomLevelToZoomFactor(content::HostZoomMap::GetZoomLevel(m_webContents.get()));
 }
 
-BrowserContextQt* WebContentsAdapter::browserContext()
+ProfileQt* WebContentsAdapter::browserContext()
 {
-    return m_browserContextAdapter ? m_browserContextAdapter->browserContext() : m_webContents ? static_cast<BrowserContextQt*>(m_webContents->GetBrowserContext()) : 0;
+    return m_browserContextAdapter ? m_browserContextAdapter->browserContext() : m_webContents ?
+                                         static_cast<ProfileQt*>(m_webContents->GetBrowserContext()) : nullptr;
 }
 
 BrowserContextAdapter* WebContentsAdapter::browserContextAdapter()
 {
-    return m_browserContextAdapter ?
-                m_browserContextAdapter : m_webContents ?
-                    static_cast<BrowserContextQt*>(m_webContents->GetBrowserContext())->adapter() : nullptr;
+    return m_browserContextAdapter ? m_browserContextAdapter : m_webContents ?
+                    static_cast<ProfileQt*>(m_webContents->GetBrowserContext())->adapter() : nullptr;
 }
 
 #ifndef QT_NO_ACCESSIBILITY
diff --git a/src/core/web_contents_adapter.h b/src/core/web_contents_adapter.h
index d4fd7adbd..95cc0eb93 100644
--- a/src/core/web_contents_adapter.h
+++ b/src/core/web_contents_adapter.h
@@ -71,13 +71,13 @@ QT_END_NAMESPACE
 
 namespace QtWebEngineCore {
 
-class BrowserContextQt;
 class DevToolsFrontendQt;
-class MessagePassingInterface;
 class FaviconManager;
-class WebEngineContext;
+class MessagePassingInterface;
+class ProfileQt;
 class RenderViewObserverHostQt;
 class WebChannelIPCTransportHost;
+class WebEngineContext;
 
 class QWEBENGINE_EXPORT WebContentsAdapter : public QEnableSharedFromThis<WebContentsAdapter> {
 public:
@@ -177,7 +177,7 @@ public:
     void dpiScaleChanged();
     void backgroundColorChanged();
     QAccessibleInterface *browserAccessible();
-    BrowserContextQt* browserContext();
+    ProfileQt* browserContext();
     BrowserContextAdapter* browserContextAdapter();
     QWebChannel *webChannel() const;
     void setWebChannel(QWebChannel *, uint worldId);
diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp
index 48eee41c0..a8c390c41 100644
--- a/src/core/web_contents_delegate_qt.cpp
+++ b/src/core/web_contents_delegate_qt.cpp
@@ -44,20 +44,20 @@
 #include "web_contents_delegate_qt.h"
 
 #include "browser_context_adapter.h"
-#include "browser_context_qt.h"
-#include "color_chooser_qt.h"
 #include "color_chooser_controller.h"
+#include "color_chooser_qt.h"
 #include "favicon_manager.h"
 #include "file_picker_controller.h"
 #include "media_capture_devices_dispatcher.h"
 #include "net/network_delegate_qt.h"
+#include "profile_qt.h"
 #include "qwebengineregisterprotocolhandlerrequest.h"
 #include "register_protocol_handler_request_controller_impl.h"
 #include "render_widget_host_view_qt.h"
 #include "type_conversion.h"
 #include "visited_links_manager_qt.h"
-#include "web_contents_adapter.h"
 #include "web_contents_adapter_client.h"
+#include "web_contents_adapter.h"
 #include "web_engine_context.h"
 #include "web_engine_settings.h"