Simplify OriginTrialContext and the way it validates tokens.

content/common/origin_trials/trial_token.h

Index: content/common/origin_trials/trial_token.h
diff --git a/content/common/origin_trials/trial_token.h b/content/common/origin_trials/trial_token.h
index f563a6378a42cb7e7c7aa93710c503aa3dfea47a..ca040c27421fa945989e9740834d250d14ea32c3 100644
--- a/content/common/origin_trials/trial_token.h
+++ b/content/common/origin_trials/trial_token.h
@@ -50,12 +50,10 @@ class CONTENT_EXPORT TrialToken {
       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_; }