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

content/common/origin_trials/trial_token_validator_unittest.cc

Index: content/common/origin_trials/trial_token_validator_unittest.cc
diff --git a/content/common/origin_trials/trial_token_validator_unittest.cc b/content/common/origin_trials/trial_token_validator_unittest.cc
index 363e3d8dd5c8c10150f9562282e2fe7181fe9da0..e3ac8fcadb9e06f26b6ec18b75b3f95d39b950a9 100644
--- a/content/common/origin_trials/trial_token_validator_unittest.cc
+++ b/content/common/origin_trials/trial_token_validator_unittest.cc
@@ -13,6 +13,7 @@
 #include "base/test/simple_test_clock.h"
 #include "base/time/time.h"
 #include "content/public/common/content_client.h"
+#include "content/public/common/origin_trial_policy.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/public/platform/WebOriginTrialTokenStatus.h"
 #include "url/gurl.h"
@@ -86,19 +87,18 @@ const char kExpiredToken[] =
 
 const char kUnparsableToken[] = "abcde";
 
-class TestContentClient : public ContentClient {
+class TestOriginTrialPolicy : public OriginTrialPolicy {
  public:
-  // ContentRendererClient methods
-  base::StringPiece GetOriginTrialPublicKey() const override {
+  base::StringPiece GetPublicKey() const override {
     return base::StringPiece(reinterpret_cast<const char*>(key_),
                              arraysize(kTestPublicKey));
   }
-  bool IsOriginTrialFeatureDisabled(base::StringPiece feature) const override {
+  bool IsFeatureDisabled(base::StringPiece feature) const override {
     return disabled_features_.count(feature.as_string()) > 0;
   }
 
   // Test setup methods
-  void SetOriginTrialPublicKey(const uint8_t* key) { key_ = key; }
+  void SetPublicKey(const uint8_t* key) { key_ = key; }
   void DisableFeature(const std::string& feature) {
     disabled_features_.insert(feature);
   }
@@ -108,6 +108,24 @@ class TestContentClient : public ContentClient {
   std::set<std::string> disabled_features_;
 };
 
+class TestContentClient : public ContentClient {
+ public:
+  // ContentRendererClient methods
+  const OriginTrialPolicy* GetOriginTrialPolicy() const override {
+    return &origin_trial_policy_;
+  }
+  // Test setup methods
+  void SetOriginTrialPublicKey(const uint8_t* key) {
+    origin_trial_policy_.SetPublicKey(key);
+  }
+  void DisableFeature(const std::string& feature) {
+    origin_trial_policy_.DisableFeature(feature);
+  }
+
+ private:
+  TestOriginTrialPolicy origin_trial_policy_;
+};
+
 }  // namespace
 
 class TrialTokenValidatorTest : public testing::Test {