Refactor OriginTrialPolicy to be an abstract interface in content/public/common

content/common/origin_trials/trial_token_validator.cc

Index: content/common/origin_trials/trial_token_validator.cc
diff --git a/content/common/origin_trials/trial_token_validator.cc b/content/common/origin_trials/trial_token_validator.cc
index e19e968983dedd4659a6394f703cf36d6711c63c..17b5431a49d777fa48c71f56cb612f57050e9332 100644
--- a/content/common/origin_trials/trial_token_validator.cc
+++ b/content/common/origin_trials/trial_token_validator.cc
@@ -7,6 +7,7 @@
 #include "base/time/time.h"
 #include "content/common/origin_trials/trial_token.h"
 #include "content/public/common/content_client.h"
+#include "content/public/common/origin_trial_policy.h"
 #include "third_party/WebKit/public/platform/WebOriginTrialTokenStatus.h"
 
 namespace content {
@@ -16,12 +17,17 @@ blink::WebOriginTrialTokenStatus TrialTokenValidator::ValidateToken(
     const url::Origin& origin,
     base::StringPiece feature_name) {
   const ContentClient* content_client = GetContentClient();
-  if (content_client->IsOriginTrialFeatureDisabled(feature_name))
+  const OriginTrialPolicy* origin_trial_policy =
+      content_client->GetOriginTrialPolicy();
+  if (!origin_trial_policy)
+    return blink::WebOriginTrialTokenStatus::NotSupported;
+
+  if (origin_trial_policy->IsFeatureDisabled(feature_name))
     return blink::WebOriginTrialTokenStatus::FeatureDisabled;
 
   // TODO(iclelland): Allow for multiple signing keys, and iterate over all
   // active keys here. https://crbug.com/543220
-  base::StringPiece public_key = content_client->GetOriginTrialPublicKey();
+  base::StringPiece public_key = origin_trial_policy->GetPublicKey();
   if (public_key.empty()) {
     return blink::WebOriginTrialTokenStatus::NotSupported;
   }