Simplify OriginTrialContext and the way it validates tokens.

content/common/origin_trials/trial_token.cc

 // Copyright 2015 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.h"
 
 #include <openssl/curve25519.h>
 
 #include <vector>
 
@@ skipping 43 matching lines @@
   *out_status = Extract(token_text, public_key, &token_payload);
   if (*out_status != blink::WebOriginTrialTokenStatus::Success) {
     return nullptr;
   }
   std::unique_ptr<TrialToken> token = Parse(token_payload);
   *out_status = token ? blink::WebOriginTrialTokenStatus::Success
                       : blink::WebOriginTrialTokenStatus::Malformed;
   return token;
 }
 
-blink::WebOriginTrialTokenStatus TrialToken::IsValidForFeature(
+blink::WebOriginTrialTokenStatus TrialToken::IsValid(
     const url::Origin& origin,
-    base::StringPiece feature_name,
     const base::Time& now) const {
   // The order of these checks is intentional. For example, will only report a
-  // token as expired if it is valid for the origin + feature combination.
+  // token as expired if it is valid for the origin.
   if (!ValidateOrigin(origin)) {
     return blink::WebOriginTrialTokenStatus::WrongOrigin;
   }
-  if (!ValidateFeatureName(feature_name)) {
-    return blink::WebOriginTrialTokenStatus::WrongFeature;
-  }
   if (!ValidateDate(now)) {
     return blink::WebOriginTrialTokenStatus::Expired;
   }
   return blink::WebOriginTrialTokenStatus::Success;
 }
 
 // static
 blink::WebOriginTrialTokenStatus TrialToken::Extract(
     const std::string& token_text,
     base::StringPiece public_key,
@@ skipping 121 matching lines @@
 }
 
 TrialToken::TrialToken(const url::Origin& origin,
                        const std::string& feature_name,
                        uint64_t expiry_timestamp)
     : origin_(origin),
       feature_name_(feature_name),
       expiry_time_(base::Time::FromDoubleT(expiry_timestamp)) {}
 
 }  // namespace content