2023-01-30 18:43:54 +01:00
|
|
|
diff --git chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc
|
2023-09-15 21:51:43 +02:00
|
|
|
index 0257b1e7e2ad4..b910f788f5a57 100644
|
2023-01-30 18:43:54 +01:00
|
|
|
--- chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc
|
|
|
|
+++ chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc
|
|
|
|
@@ -23,6 +23,7 @@
|
|
|
|
#include "base/strings/utf_string_conversions.h"
|
|
|
|
#include "base/time/time.h"
|
|
|
|
#include "build/build_config.h"
|
|
|
|
+#include "cef/libcef/features/runtime.h"
|
|
|
|
#include "chrome/browser/browser_process.h"
|
|
|
|
#include "chrome/browser/enterprise/connectors/analysis/analysis_settings.h"
|
|
|
|
#include "chrome/browser/enterprise/connectors/analysis/content_analysis_dialog.h"
|
2023-09-15 21:51:43 +02:00
|
|
|
@@ -246,6 +247,9 @@ bool ContentAnalysisDelegate::IsEnabled(Profile* profile,
|
2023-05-30 10:55:32 +02:00
|
|
|
GURL url,
|
|
|
|
Data* data,
|
|
|
|
AnalysisConnector connector) {
|
2023-01-30 18:43:54 +01:00
|
|
|
+ if (cef::IsAlloyRuntimeEnabled())
|
|
|
|
+ return false;
|
|
|
|
+
|
2023-05-30 10:55:32 +02:00
|
|
|
auto* service = ConnectorsServiceFactory::GetForBrowserContext(profile);
|
|
|
|
// If the corresponding Connector policy isn't set, don't perform scans.
|
|
|
|
if (!service || !service->IsConnectorEnabled(connector))
|
2019-04-24 04:50:25 +02:00
|
|
|
diff --git chrome/browser/net/profile_network_context_service.cc chrome/browser/net/profile_network_context_service.cc
|
2023-09-15 21:51:43 +02:00
|
|
|
index fd92bb9a1f148..4d27c25791033 100644
|
2019-04-24 04:50:25 +02:00
|
|
|
--- chrome/browser/net/profile_network_context_service.cc
|
|
|
|
+++ chrome/browser/net/profile_network_context_service.cc
|
2022-05-19 12:28:44 +02:00
|
|
|
@@ -22,6 +22,7 @@
|
|
|
|
#include "base/trace_event/trace_event.h"
|
2022-01-25 21:26:51 +01:00
|
|
|
#include "build/build_config.h"
|
2021-01-28 00:13:12 +01:00
|
|
|
#include "build/chromeos_buildflags.h"
|
2020-06-28 20:29:44 +02:00
|
|
|
+#include "cef/libcef/features/runtime.h"
|
2021-10-19 00:17:16 +02:00
|
|
|
#include "chrome/browser/browser_features.h"
|
2019-05-02 20:50:59 +02:00
|
|
|
#include "chrome/browser/browser_process.h"
|
2023-04-04 20:00:13 +02:00
|
|
|
#include "chrome/browser/content_settings/cookie_settings_factory.h"
|
2023-09-15 21:51:43 +02:00
|
|
|
@@ -337,8 +338,10 @@ ProfileNetworkContextService::ProfileNetworkContextService(Profile* profile)
|
2023-01-06 18:06:46 +01:00
|
|
|
base::Unretained(this)));
|
|
|
|
cookie_settings_ = CookieSettingsFactory::GetForProfile(profile);
|
|
|
|
cookie_settings_observation_.Observe(cookie_settings_.get());
|
|
|
|
- privacy_sandbox_settings_observer_.Observe(
|
|
|
|
- PrivacySandboxSettingsFactory::GetForProfile(profile));
|
|
|
|
+ if (!cef::IsAlloyRuntimeEnabled()) {
|
|
|
|
+ privacy_sandbox_settings_observer_.Observe(
|
|
|
|
+ PrivacySandboxSettingsFactory::GetForProfile(profile));
|
|
|
|
+ }
|
|
|
|
|
|
|
|
DisableQuicIfNotAllowed();
|
|
|
|
|
2023-09-15 21:51:43 +02:00
|
|
|
@@ -893,9 +896,26 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
|
2023-07-21 00:11:34 +02:00
|
|
|
network_context_params->cookie_manager_params =
|
|
|
|
CreateCookieManagerParams(profile_, *cookie_settings_);
|
2019-04-24 04:50:25 +02:00
|
|
|
|
2023-07-21 00:11:34 +02:00
|
|
|
+ if (!in_memory) {
|
|
|
|
+ network_context_params->file_paths =
|
|
|
|
+ ::network::mojom::NetworkContextFilePaths::New();
|
|
|
|
+ }
|
|
|
|
+
|
2019-04-24 04:50:25 +02:00
|
|
|
// Configure on-disk storage for non-OTR profiles. OTR profiles just use
|
|
|
|
// default behavior (in memory storage, default sizes).
|
2020-06-25 04:34:12 +02:00
|
|
|
- if (!in_memory) {
|
2020-06-28 20:29:44 +02:00
|
|
|
+ if (!in_memory && cef::IsAlloyRuntimeEnabled()) {
|
2019-10-01 15:55:16 +02:00
|
|
|
+ PrefService* prefs = profile_->GetPrefs();
|
|
|
|
+ // Configure the HTTP cache path and size.
|
|
|
|
+ const base::FilePath& base_cache_path =
|
|
|
|
+ prefs->GetFilePath(prefs::kDiskCacheDir);
|
2019-05-02 20:50:59 +02:00
|
|
|
+ DCHECK(!base_cache_path.empty());
|
2023-07-21 00:11:34 +02:00
|
|
|
+ network_context_params->file_paths->http_cache_directory =
|
2019-10-01 15:55:16 +02:00
|
|
|
+ base_cache_path.Append(chrome::kCacheDirname);
|
|
|
|
+ network_context_params->http_cache_max_size =
|
|
|
|
+ prefs->GetInteger(prefs::kDiskCacheSize);
|
2020-06-25 04:34:12 +02:00
|
|
|
+ }
|
|
|
|
+
|
2020-06-28 20:29:44 +02:00
|
|
|
+ if (!in_memory && !cef::IsAlloyRuntimeEnabled()) {
|
2019-10-01 15:55:16 +02:00
|
|
|
PrefService* local_state = g_browser_process->local_state();
|
|
|
|
// Configure the HTTP cache path and size.
|
|
|
|
base::FilePath base_cache_path;
|
2023-09-15 21:51:43 +02:00
|
|
|
@@ -904,15 +924,14 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
|
2023-07-21 00:11:34 +02:00
|
|
|
local_state->GetFilePath(prefs::kDiskCacheDir);
|
|
|
|
if (!disk_cache_dir.empty())
|
|
|
|
base_cache_path = disk_cache_dir.Append(base_cache_path.BaseName());
|
|
|
|
+ network_context_params->file_paths->http_cache_directory =
|
|
|
|
+ base_cache_path.Append(chrome::kCacheDirname);
|
2023-06-26 12:13:38 +02:00
|
|
|
const int disk_cache_size = local_state->GetInteger(prefs::kDiskCacheSize);
|
|
|
|
network_context_params->http_cache_max_size = disk_cache_size;
|
|
|
|
network_context_params->shared_dictionary_cache_max_size = disk_cache_size;
|
2020-06-25 04:34:12 +02:00
|
|
|
+ }
|
2019-10-01 15:55:16 +02:00
|
|
|
|
2023-07-21 00:11:34 +02:00
|
|
|
- network_context_params->file_paths =
|
|
|
|
- ::network::mojom::NetworkContextFilePaths::New();
|
|
|
|
-
|
|
|
|
- network_context_params->file_paths->http_cache_directory =
|
|
|
|
- base_cache_path.Append(chrome::kCacheDirname);
|
2020-06-25 04:34:12 +02:00
|
|
|
+ if (!in_memory) {
|
2023-07-21 00:11:34 +02:00
|
|
|
network_context_params->file_paths->data_directory =
|
|
|
|
path.Append(chrome::kNetworkDataDirname);
|
|
|
|
network_context_params->file_paths->unsandboxed_data_path = path;
|
2023-01-06 18:06:46 +01:00
|
|
|
diff --git chrome/browser/signin/identity_manager_factory.cc chrome/browser/signin/identity_manager_factory.cc
|
2023-07-21 00:11:34 +02:00
|
|
|
index 77522f65b7b6e..51cc2d60d4b8d 100644
|
2023-01-06 18:06:46 +01:00
|
|
|
--- chrome/browser/signin/identity_manager_factory.cc
|
|
|
|
+++ chrome/browser/signin/identity_manager_factory.cc
|
|
|
|
@@ -11,6 +11,7 @@
|
|
|
|
#include "base/observer_list.h"
|
|
|
|
#include "build/build_config.h"
|
|
|
|
#include "build/chromeos_buildflags.h"
|
|
|
|
+#include "cef/libcef/features/runtime.h"
|
|
|
|
#include "chrome/browser/browser_process.h"
|
|
|
|
#include "chrome/browser/image_fetcher/image_decoder_impl.h"
|
|
|
|
#include "chrome/browser/profiles/profile.h"
|
2023-06-26 12:13:38 +02:00
|
|
|
@@ -96,6 +97,7 @@ IdentityManagerFactory::~IdentityManagerFactory() {
|
2023-01-06 18:06:46 +01:00
|
|
|
// static
|
|
|
|
signin::IdentityManager* IdentityManagerFactory::GetForProfile(
|
|
|
|
Profile* profile) {
|
|
|
|
+ DCHECK(!cef::IsAlloyRuntimeEnabled());
|
|
|
|
return static_cast<signin::IdentityManager*>(
|
|
|
|
GetInstance()->GetServiceForBrowserContext(profile, true));
|
|
|
|
}
|
2019-06-05 16:15:45 +02:00
|
|
|
diff --git net/cookies/cookie_monster.cc net/cookies/cookie_monster.cc
|
2023-09-15 21:51:43 +02:00
|
|
|
index 0c3ce2e289b59..7ea3744e33b60 100644
|
2019-06-05 16:15:45 +02:00
|
|
|
--- net/cookies/cookie_monster.cc
|
|
|
|
+++ net/cookies/cookie_monster.cc
|
2023-08-09 23:17:17 +02:00
|
|
|
@@ -552,6 +552,25 @@ void CookieMonster::SetCookieableSchemes(
|
2019-06-05 16:15:45 +02:00
|
|
|
MaybeRunCookieCallback(std::move(callback), true);
|
|
|
|
}
|
|
|
|
|
|
|
|
+void CookieMonster::AddCookieableSchemes(
|
|
|
|
+ const std::vector<std::string>& schemes,
|
|
|
|
+ SetCookieableSchemesCallback callback) {
|
2022-10-17 19:27:40 +02:00
|
|
|
+ DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
|
2019-06-05 16:15:45 +02:00
|
|
|
+
|
|
|
|
+ // Calls to this method will have no effect if made after a WebView or
|
|
|
|
+ // CookieManager instance has been created.
|
|
|
|
+ if (initialized_) {
|
|
|
|
+ MaybeRunCookieCallback(std::move(callback), false);
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if (!schemes.empty()) {
|
|
|
|
+ cookieable_schemes_.insert(cookieable_schemes_.begin(), schemes.begin(),
|
|
|
|
+ schemes.end());
|
|
|
|
+ }
|
|
|
|
+ MaybeRunCookieCallback(std::move(callback), true);
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
// This function must be called before the CookieMonster is used.
|
|
|
|
void CookieMonster::SetPersistSessionCookies(bool persist_session_cookies) {
|
2022-10-17 19:27:40 +02:00
|
|
|
DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
|
2019-06-05 16:15:45 +02:00
|
|
|
diff --git net/cookies/cookie_monster.h net/cookies/cookie_monster.h
|
2023-08-09 23:17:17 +02:00
|
|
|
index 3ca2c691cfd00..a148193f96a0e 100644
|
2019-06-05 16:15:45 +02:00
|
|
|
--- net/cookies/cookie_monster.h
|
|
|
|
+++ net/cookies/cookie_monster.h
|
2022-11-15 18:50:53 +01:00
|
|
|
@@ -208,6 +208,8 @@ class NET_EXPORT CookieMonster : public CookieStore {
|
2019-06-05 16:15:45 +02:00
|
|
|
CookieChangeDispatcher& GetChangeDispatcher() override;
|
|
|
|
void SetCookieableSchemes(const std::vector<std::string>& schemes,
|
|
|
|
SetCookieableSchemesCallback callback) override;
|
|
|
|
+ void AddCookieableSchemes(const std::vector<std::string>& schemes,
|
|
|
|
+ SetCookieableSchemesCallback callback) override;
|
2022-11-15 18:50:53 +01:00
|
|
|
absl::optional<bool> SiteHasCookieInOtherPartition(
|
|
|
|
const net::SchemefulSite& site,
|
|
|
|
const absl::optional<CookiePartitionKey>& partition_key) const override;
|
2019-06-05 16:15:45 +02:00
|
|
|
diff --git net/cookies/cookie_store.h net/cookies/cookie_store.h
|
2023-01-30 18:43:54 +01:00
|
|
|
index 61fd008fc067e..73909be088278 100644
|
2019-06-05 16:15:45 +02:00
|
|
|
--- net/cookies/cookie_store.h
|
|
|
|
+++ net/cookies/cookie_store.h
|
2022-03-26 02:12:30 +01:00
|
|
|
@@ -163,6 +163,11 @@ class NET_EXPORT CookieStore {
|
2019-11-12 17:11:44 +01:00
|
|
|
// Transfer ownership of a CookieAccessDelegate.
|
|
|
|
void SetCookieAccessDelegate(std::unique_ptr<CookieAccessDelegate> delegate);
|
2019-06-05 16:15:45 +02:00
|
|
|
|
|
|
|
+ // Adds to the list of cookieable schemes. Does nothing if called after first
|
|
|
|
+ // use of the instance (i.e. after the instance initialization process).
|
|
|
|
+ virtual void AddCookieableSchemes(const std::vector<std::string>& schemes,
|
|
|
|
+ SetCookieableSchemesCallback callback) = 0;
|
|
|
|
+
|
2021-09-20 11:06:23 +02:00
|
|
|
// This may be null if no delegate has been set yet, or the delegate has been
|
|
|
|
// reset to null.
|
|
|
|
const CookieAccessDelegate* cookie_access_delegate() const {
|
2019-06-05 16:15:45 +02:00
|
|
|
diff --git services/network/cookie_manager.cc services/network/cookie_manager.cc
|
2023-09-15 21:51:43 +02:00
|
|
|
index 6c804ec1092af..605ff3b32b0b8 100644
|
2019-06-05 16:15:45 +02:00
|
|
|
--- services/network/cookie_manager.cc
|
|
|
|
+++ services/network/cookie_manager.cc
|
2023-09-15 21:51:43 +02:00
|
|
|
@@ -297,14 +297,9 @@ void CookieManager::AllowFileSchemeCookies(
|
2019-06-05 16:15:45 +02:00
|
|
|
AllowFileSchemeCookiesCallback callback) {
|
2023-07-21 00:11:34 +02:00
|
|
|
OnSettingsWillChange();
|
|
|
|
|
2019-06-05 16:15:45 +02:00
|
|
|
- std::vector<std::string> cookieable_schemes(
|
|
|
|
- net::CookieMonster::kDefaultCookieableSchemes,
|
|
|
|
- net::CookieMonster::kDefaultCookieableSchemes +
|
|
|
|
- net::CookieMonster::kDefaultCookieableSchemesCount);
|
|
|
|
- if (allow) {
|
|
|
|
- cookieable_schemes.push_back(url::kFileScheme);
|
|
|
|
- }
|
|
|
|
- cookie_store_->SetCookieableSchemes(cookieable_schemes, std::move(callback));
|
|
|
|
+ if (!allow)
|
|
|
|
+ return;
|
|
|
|
+ cookie_store_->AddCookieableSchemes({url::kFileScheme}, std::move(callback));
|
|
|
|
}
|
|
|
|
|
|
|
|
void CookieManager::SetForceKeepSessionState() {
|
2019-04-24 04:50:25 +02:00
|
|
|
diff --git services/network/network_context.cc services/network/network_context.cc
|
2023-09-21 20:11:46 +02:00
|
|
|
index a107e19d2aa1c..9e37a743a5548 100644
|
2019-04-24 04:50:25 +02:00
|
|
|
--- services/network/network_context.cc
|
|
|
|
+++ services/network/network_context.cc
|
2023-09-21 20:11:46 +02:00
|
|
|
@@ -2446,16 +2446,20 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
|
2020-12-02 23:31:49 +01:00
|
|
|
network_service_->network_quality_estimator());
|
2019-04-24 04:50:25 +02:00
|
|
|
}
|
|
|
|
|
2022-01-25 21:26:51 +01:00
|
|
|
- if (session_cleanup_cookie_store) {
|
2019-04-24 04:50:25 +02:00
|
|
|
- std::unique_ptr<net::CookieMonster> cookie_store =
|
2022-10-17 19:27:40 +02:00
|
|
|
- std::make_unique<net::CookieMonster>(session_cleanup_cookie_store.get(),
|
|
|
|
- net_log);
|
2022-01-25 21:26:51 +01:00
|
|
|
- if (params_->persist_session_cookies)
|
|
|
|
- cookie_store->SetPersistSessionCookies(true);
|
|
|
|
+ std::unique_ptr<net::CookieMonster> cookie_store =
|
2022-10-17 19:27:40 +02:00
|
|
|
+ std::make_unique<net::CookieMonster>(session_cleanup_cookie_store.get(),
|
|
|
|
+ net_log);
|
2022-01-25 21:26:51 +01:00
|
|
|
+ if (session_cleanup_cookie_store && params_->persist_session_cookies)
|
|
|
|
+ cookie_store->SetPersistSessionCookies(true);
|
2020-12-02 23:31:49 +01:00
|
|
|
|
2019-10-01 15:55:16 +02:00
|
|
|
- builder.SetCookieStore(std::move(cookie_store));
|
2019-05-03 00:23:57 +02:00
|
|
|
+ if (params_->cookieable_schemes.has_value()) {
|
2019-04-24 04:50:25 +02:00
|
|
|
+ cookie_store->SetCookieableSchemes(
|
2019-05-03 00:23:57 +02:00
|
|
|
+ *params_->cookieable_schemes,
|
2019-04-24 04:50:25 +02:00
|
|
|
+ net::CookieStore::SetCookieableSchemesCallback());
|
2020-03-30 22:13:42 +02:00
|
|
|
}
|
|
|
|
|
2019-10-01 15:55:16 +02:00
|
|
|
+ builder.SetCookieStore(std::move(cookie_store));
|
2019-04-24 04:50:25 +02:00
|
|
|
+
|
2023-04-26 21:55:59 +02:00
|
|
|
if (base::FeatureList::IsEnabled(features::kPrivateStateTokens) ||
|
|
|
|
base::FeatureList::IsEnabled(features::kFledgePst)) {
|
2020-04-14 21:31:00 +02:00
|
|
|
trust_token_store_ = std::make_unique<PendingTrustTokenStore>();
|
2019-04-24 04:50:25 +02:00
|
|
|
diff --git services/network/public/mojom/network_context.mojom services/network/public/mojom/network_context.mojom
|
2023-09-21 20:11:46 +02:00
|
|
|
index 6164ab364a404..44ab11a34eb44 100644
|
2019-04-24 04:50:25 +02:00
|
|
|
--- services/network/public/mojom/network_context.mojom
|
|
|
|
+++ services/network/public/mojom/network_context.mojom
|
2023-09-15 21:51:43 +02:00
|
|
|
@@ -377,6 +377,9 @@ struct NetworkContextParams {
|
2019-04-24 04:50:25 +02:00
|
|
|
// cookies. Otherwise it should be false.
|
|
|
|
bool persist_session_cookies = false;
|
|
|
|
|
|
|
|
+ // Schemes that will be passed to CookieMonster::SetCookieableSchemes.
|
2019-05-03 00:23:57 +02:00
|
|
|
+ array<string>? cookieable_schemes;
|
2019-04-24 04:50:25 +02:00
|
|
|
+
|
|
|
|
// True if an HTTP cache should be used.
|
|
|
|
bool http_cache_enabled = true;
|
|
|
|
// Maximum size of the HTTP cache. 0 means to use the default size.
|