Add disabled origin trial feature list

content/common/origin_trials/trial_token_validator.cc

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 f9261fe19a30804e5711e6f5dc971ec3870666cb..07e0cf029ad8c5155ce2174115ae160316f7419d 100644
--- a/content/common/origin_trials/trial_token_validator.cc
+++ b/content/common/origin_trials/trial_token_validator.cc
@@ -15,9 +15,12 @@ blink::WebOriginTrialTokenStatus TrialTokenValidator::ValidateToken(
     const std::string& token,
     const url::Origin& origin,
     base::StringPiece feature_name) {
+  ContentClient* content_client = GetContentClient();

[Sorin Jianu, 2016/06/07 17:20:24]

can this be const?

[iclelland, 2016/06/08 13:37:56]

Certainly -- I was thinking at the time that I didn't want to have to constrain
every implementation by making IsOriginTrialFeatureDisabled a const method.
That's not a super compelling reason, though, and the methods in the key manager
were already const anyway. Done.

+  if (content_client->IsOriginTrialFeatureDisabled(feature_name))
+    return blink::WebOriginTrialTokenStatus::FeatureDisabled;
+
   // 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 blink::WebOriginTrialTokenStatus::NotSupported;