Add disabled origin trial feature list

content/common/origin_trials/trial_token_validator.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/common/origin_trials/trial_token_validator.h"
 
 #include "base/time/time.h"
 #include "content/common/origin_trials/trial_token.h"
 #include "content/public/common/content_client.h"
 #include "third_party/WebKit/public/platform/WebOriginTrialTokenStatus.h"
 
 namespace content {
 
 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;
   }
 
   blink::WebOriginTrialTokenStatus status;
   std::unique_ptr<TrialToken> trial_token =
       TrialToken::From(token, public_key, &status);
   if (status != blink::WebOriginTrialTokenStatus::Success) {
     return status;
   }
 
   return trial_token->IsValidForFeature(origin, feature_name,
                                         base::Time::Now());
 }
 
 }  // namespace content