Store Origin-Trial tokens to ServiceWorkerDataBase

content/common/origin_trials/trial_token_validator.h

Index: content/common/origin_trials/trial_token_validator.h
diff --git a/content/common/origin_trials/trial_token_validator.h b/content/common/origin_trials/trial_token_validator.h
index 1997985cb4e4cc013324748b94997c25562c6c79..f7898865617c8f548d5ad51520e3efde4288bb98 100644
--- a/content/common/origin_trials/trial_token_validator.h
+++ b/content/common/origin_trials/trial_token_validator.h
@@ -5,7 +5,10 @@
 #ifndef CONTENT_COMMON_ORIGIN_TRIALS_TRIAL_TOKEN_VALIDATOR_H_
 #define CONTENT_COMMON_ORIGIN_TRIALS_TRIAL_TOKEN_VALIDATOR_H_
 
+#include <map>
+#include <memory>
 #include <string>
+#include <vector>
 #include "base/strings/string_piece.h"
 #include "content/common/content_export.h"
 #include "url/origin.h"
@@ -23,6 +26,9 @@ namespace content {
 
 namespace TrialTokenValidator {
 
+using FeatureToTokensMap = std::map<std::string /* feature_name */,
+                                    std::vector<std::string /* token */>>;
+
 // If token validates, |*feature_name| is set to the name of the feature the
 // token enables.
 // This method is thread-safe.
@@ -39,6 +45,14 @@ CONTENT_EXPORT bool RequestEnablesFeature(
     const net::HttpResponseHeaders* response_headers,
     base::StringPiece feature_name);
 
+CONTENT_EXPORT std::unique_ptr<FeatureToTokensMap> GetValidTokensFromHeaders(

[iclelland, 2016/10/12 03:31:39]

Can you write a comment for these two methods -- at least to mention that they
are used to re-validate previously stored tokens?

[horo, 2016/10/12 04:13:14]

Done.

+    const url::Origin& origin,
+    const net::HttpResponseHeaders* headers);
+
+CONTENT_EXPORT std::unique_ptr<FeatureToTokensMap> GetValidTokens(
+    const url::Origin& origin,
+    const FeatureToTokensMap& tokens);
+
 }  // namespace TrialTokenValidator
 
 }  // namespace content