Add disabled origin trial feature list

content/renderer/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/renderer/origin_trials/trial_token_validator.h"
 
 #include "base/time/time.h"
 #include "content/public/common/content_client.h"
 #include "content/public/renderer/content_renderer_client.h"
 #include "content/renderer/origin_trials/trial_token.h"
 
 namespace content {
 
 TrialTokenValidator::TrialTokenValidator() {}
 TrialTokenValidator::~TrialTokenValidator() {}
 
 bool TrialTokenValidator::validateToken(const blink::WebString& token,
                                         const blink::WebString& origin,
                                         const blink::WebString& featureName) {
   scoped_ptr<TrialToken> trial_token = TrialToken::Parse(token.utf8());
 
   ContentClient* content_client = GetContentClient();
   CHECK(content_client);
 
   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? Minor optimization to avoid
getting the key if won't be used.

[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);
 }
 
 }  // namespace content