diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-01-17 15:31:36 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-02-28 14:24:41 +0100 |
| commit | c3ab932f8b2f3a52383ce0db3ff67c925b138bde (patch) | |
| tree | 48a9899f1ac5a4f29b6814c2e6c6717300cad137 /src/core/profile_io_data_qt.cpp | |
| parent | 26b4267a3b00ebedb560169d09f974cd87a6a370 (diff) | |
Adaptations for Chromium 79
Fixes: QTBUG-80737
Fixes: QTBUG-81556
Fixes: QTBUG-81614
Change-Id: Ie6a69cdbf46d0508bff226f1b8fed28a618e1949
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core/profile_io_data_qt.cpp')
| -rw-r--r-- | src/core/profile_io_data_qt.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/core/profile_io_data_qt.cpp b/src/core/profile_io_data_qt.cpp index d24689dec..6eb758f46 100644 --- a/src/core/profile_io_data_qt.cpp +++ b/src/core/profile_io_data_qt.cpp @@ -51,7 +51,6 @@ #include "net/proxy_resolution/proxy_config_service.h" #include "net/proxy_resolution/proxy_resolution_service.h" #include "net/ssl/ssl_config_service_defaults.h" -#include "services/file/user_id_map.h" #include "services/network/proxy_service_mojo.h" #include "services/network/public/cpp/features.h" #include "services/network/public/cpp/cors/origin_access_list.h" @@ -269,11 +268,6 @@ void ProfileIODataQt::updateStorageSettings() const std::lock_guard<QRecursiveMutex> lock(m_mutex); setFullConfiguration(); - base::Token groupId = content::BrowserContext::GetServiceInstanceGroupFor(m_profile); - if (file::GetUserDirForInstanceGroup(groupId) != toFilePath(m_profileAdapter->dataPath())) { - file::ForgetServiceInstanceGroupUserDirAssociation(groupId); - file::AssociateServiceInstanceGroupWithUserDir(groupId, toFilePath(m_profileAdapter->dataPath())); - } if (!m_pendingStorageRequestGeneration) requestStorageGeneration(); } @@ -429,7 +423,8 @@ network::mojom::NetworkContextParamsPtr ProfileIODataQt::CreateNetworkContextPar network_context_params->accept_language = m_httpAcceptLanguage.toStdString(); network_context_params->enable_referrers = true; - network_context_params->enable_encrypted_cookies = false; // ??? + // Encrypted cookies requires os_crypt, which currently has issues for us on Linux. + network_context_params->enable_encrypted_cookies = false; // network_context_params->proxy_resolver_factory = std::move(m_proxyResolverFactoryInterface); network_context_params->http_cache_enabled = m_httpCacheType != ProfileAdapter::NoCache; |