Simplify OriginTrialContext and the way it validates tokens.

content/common/origin_trials/trial_token.h

 // 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.
 
 #ifndef CONTENT_COMMON_ORIGIN_TRIALS_TRIAL_TOKEN_H_
 #define CONTENT_COMMON_ORIGIN_TRIALS_TRIAL_TOKEN_H_
 
 #include <memory>
 #include <string>
 
@@ skipping 32 matching lines @@
   // Note that success does not mean that the token is currently valid, or
   // appropriate for a given origin / feature. It only means that it is
   // correctly formatted and signed by the supplied public key, and can be
   // parsed.
   static std::unique_ptr<TrialToken> From(
       const std::string& token_text,
       base::StringPiece public_key,
       blink::WebOriginTrialTokenStatus* out_status);
 
   // Returns success if this token is appropriate for use by the given origin
-  // and feature name, and has not yet expired. Otherwise, the return value
-  // indicates why the token is not valid.
-  blink::WebOriginTrialTokenStatus IsValidForFeature(
-      const url::Origin& origin,
-      base::StringPiece feature_name,
-      const base::Time& now) const;
+  // and has not yet expired. Otherwise, the return value indicates why the
+  // token is not valid.
+  blink::WebOriginTrialTokenStatus IsValid(const url::Origin& origin,
+                                           const base::Time& now) const;
 
   url::Origin origin() { return origin_; }
   std::string feature_name() { return feature_name_; }
   base::Time expiry_time() { return expiry_time_; }
 
  protected:
   friend class TrialTokenTest;
 
   // If the string represents a properly signed and well-formed token, the token
   // payload is returned in the |out_token_payload| parameter and success is
@@ skipping 27 matching lines @@
   // The name of the experimental feature which this token enables.
   std::string feature_name_;
 
   // The time until which this token should be considered valid.
   base::Time expiry_time_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_ORIGIN_TRIALS_TRIAL_TOKEN_H_