Index: content/common/origin_trials/trial_token_validator.cc |
diff --git a/content/common/origin_trials/trial_token_validator.cc b/content/common/origin_trials/trial_token_validator.cc |
index 6eef75a5e9a40be7f7cf5b3a3d594dc8e789f1b7..863d444a6e5258ea880547b501ac7bc855becbe2 100644 |
--- a/content/common/origin_trials/trial_token_validator.cc |
+++ b/content/common/origin_trials/trial_token_validator.cc |
@@ -10,20 +10,26 @@ |
namespace content { |
-bool TrialTokenValidator::ValidateToken(const std::string& token, |
- const url::Origin& origin, |
- base::StringPiece feature_name) { |
+TrialTokenStatus TrialTokenValidator::ValidateToken( |
+ const std::string& token, |
+ const url::Origin& origin, |
+ base::StringPiece feature_name) { |
// TODO(iclelland): Allow for multiple signing keys, and iterate over all |
// active keys here. https://crbug.com/543220 |
ContentClient* content_client = GetContentClient(); |
base::StringPiece public_key = content_client->GetOriginTrialPublicKey(); |
if (public_key.empty()) { |
- return false; |
+ return TRIAL_TOKEN_STATUS_NOT_SUPPORTED; |
} |
- std::unique_ptr<TrialToken> trial_token = TrialToken::From(token, public_key); |
- return trial_token && |
- trial_token->IsValidForFeature(origin, feature_name, |
+ TrialTokenStatus status; |
+ std::unique_ptr<TrialToken> trial_token = |
+ TrialToken::From(token, public_key, &status); |
+ if (status != TRIAL_TOKEN_STATUS_SUCCESS) { |
+ return status; |
+ } |
+ |
+ return trial_token->IsValidForFeature(origin, feature_name, |
base::Time::Now()); |
} |