Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(738)

Unified Diff: content/renderer/origin_trials/trial_token_validator.cc

Issue 1741783002: Add disabled origin trial feature list (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ef-finch
Patch Set: Rebase; style fixes Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/origin_trials/trial_token_validator.cc
diff --git a/content/renderer/origin_trials/trial_token_validator.cc b/content/renderer/origin_trials/trial_token_validator.cc
index 1df8dc78c3d1c193d4f036aa1a5f4cca7232d6a8..11cd04fddb1a6544542ec1ecdee86654a4b57161 100644
--- a/content/renderer/origin_trials/trial_token_validator.cc
+++ b/content/renderer/origin_trials/trial_token_validator.cc
@@ -25,6 +25,10 @@ bool TrialTokenValidator::validateToken(const blink::WebString& token,
base::StringPiece public_key =
content_client->renderer()->GetOriginTrialPublicKey();
+ if (content_client->renderer()->IsOriginTrialFeatureDisabled(
+ featureName.utf8()))
+ return false;
chasej 2016/02/29 19:23:26 Move this check before getting the public key? Min
iclelland 2016/05/24 19:38:43 Done.
+
return !public_key.empty() && trial_token &&
trial_token->IsAppropriate(origin.utf8(), featureName.utf8()) &&
trial_token->IsValid(base::Time::Now(), public_key);

Powered by Google App Engine
This is Rietveld 408576698