check in static method TrialTokenValidator::IsTrialPossibleOnOrigin
This commit is contained in:
parent
3ca79ce4e0
commit
6c2adcaf80
1 changed files with 13 additions and 1 deletions
|
@ -8,11 +8,12 @@ Subject: Disable third-party origin trials
|
|||
.../browser/renderer_host/navigation_request.cc | 1 -
|
||||
content/renderer/render_frame_impl.cc | 17 +----------------
|
||||
.../shell/common/shell_origin_trial_policy.cc | 10 ++++------
|
||||
.../origin_trials/trial_token_validator.cc | 1 +
|
||||
.../renderer/core/loader/document_loader.cc | 17 -----------------
|
||||
.../blink/renderer/core/loader/http_equiv.cc | 16 ----------------
|
||||
.../core/origin_trials/origin_trial_context.cc | 15 ++-------------
|
||||
.../platform/runtime_enabled_features.json5 | 4 ----
|
||||
9 files changed, 12 insertions(+), 77 deletions(-)
|
||||
10 files changed, 13 insertions(+), 77 deletions(-)
|
||||
|
||||
diff --git a/components/embedder_support/origin_trials/origin_trial_policy_impl.cc b/components/embedder_support/origin_trials/origin_trial_policy_impl.cc
|
||||
--- a/components/embedder_support/origin_trials/origin_trial_policy_impl.cc
|
||||
|
@ -144,6 +145,17 @@ diff --git a/content/shell/common/shell_origin_trial_policy.cc b/content/shell/c
|
|||
}
|
||||
|
||||
const std::vector<blink::OriginTrialPublicKey>&
|
||||
diff --git a/third_party/blink/common/origin_trials/trial_token_validator.cc b/third_party/blink/common/origin_trials/trial_token_validator.cc
|
||||
--- a/third_party/blink/common/origin_trials/trial_token_validator.cc
|
||||
+++ b/third_party/blink/common/origin_trials/trial_token_validator.cc
|
||||
@@ -205,6 +205,7 @@ TrialTokenValidator::GetValidTokens(const url::Origin& origin,
|
||||
|
||||
// static
|
||||
bool TrialTokenValidator::IsTrialPossibleOnOrigin(const GURL& url) {
|
||||
+ if ((true)) return false;
|
||||
OriginTrialPolicy* policy = PolicyGetter().Run();
|
||||
return policy && policy->IsOriginTrialsSupported() &&
|
||||
policy->IsOriginSecure(url);
|
||||
diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_party/blink/renderer/core/loader/document_loader.cc
|
||||
--- a/third_party/blink/renderer/core/loader/document_loader.cc
|
||||
+++ b/third_party/blink/renderer/core/loader/document_loader.cc
|
||||
|
|
Loading…
Add table
Reference in a new issue