Support subdomain matching in trial 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 ca040c27421fa945989e9740834d250d14ea32c3..0fe4f5216bc3398a663ac7c8b5b18f3e43d21273 100644
--- a/content/common/origin_trials/trial_token.h
+++ b/content/common/origin_trials/trial_token.h
@@ -19,14 +19,13 @@ enum class WebOriginTrialTokenStatus;
 
 namespace content {
 
-// The Experimental Framework (EF) provides limited access to experimental
-// features, on a per-origin basis (origin trials). This class defines the trial
-// token data structure, used to securely provide access to an experimental
-// feature.
+// The Origin Trials Framework (OT) provides limited access to experimental
+// features, on a per-origin basis. This class defines the trial token data
+// structure, used to securely provide access to an experimental feature.
 //
-// Features are defined by string names, provided by the implementers. The EF
+// Features are defined by string names, provided by the implementers. The OT
 // code does not maintain an enum or constant list for feature names. Instead,
-// the EF validates the name provided by the feature implementation against any
+// it validates the name provided by the feature implementation against any
 // provided tokens.
 //
 // More documentation on the token format can be found at
@@ -56,6 +55,7 @@ class CONTENT_EXPORT TrialToken {
                                            const base::Time& now) const;
 
   url::Origin origin() { return origin_; }
+  bool is_wildcard_origin() const { return is_wildcard_origin_; }
   std::string feature_name() { return feature_name_; }
   base::Time expiry_time() { return expiry_time_; }
 
@@ -85,12 +85,16 @@ class CONTENT_EXPORT TrialToken {
 
  private:
   TrialToken(const url::Origin& origin,
+             bool is_wildcard_origin,
              const std::string& feature_name,
              uint64_t expiry_timestamp);
 
   // The origin for which this token is valid. Must be a secure origin.
   url::Origin origin_;
 
+  // Indicates if the origin should use wildcard matching, to enable subdomains.
+  bool is_wildcard_origin_;

[iclelland, 2016/10/12 04:18:15]

Bikeshed: Would this be better named something like match_subdomains_ ? (Just
thinking about the fact that we're not using a wildcard character anymore)

Fine either way, really, though.

+
   // The name of the experimental feature which this token enables.
   std::string feature_name_;