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

chrome/common/chrome_content_client.cc

Index: chrome/common/chrome_content_client.cc
diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc
index 4b2af53577ee0e048c8f8318a932e628dfcb3285..d57f1ede915ed0d75583b9ae795e19c020915f97 100644
--- a/chrome/common/chrome_content_client.cc
+++ b/chrome/common/chrome_content_client.cc
@@ -698,30 +698,25 @@ bool ChromeContentClient::IsSupplementarySiteIsolationModeEnabled() {
 #endif
 }
 
-base::StringPiece ChromeContentClient::GetOriginTrialPublicKey() const {
-  return origin_trial_key_manager_.GetPublicKey();
-}
-
-bool ChromeContentClient::IsOriginTrialFeatureDisabled(
-    base::StringPiece feature) const {
-  return origin_trial_key_manager_.IsFeatureDisabled(feature);
-}
-
 void ChromeContentClient::InitializeOriginTrialPolicy() {
   // Set the public key and disabled feature list for the origin trial key
   // manager, based on the command line flags which were passed to this process.
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kOriginTrialPublicKey)) {
-    origin_trial_key_manager()->SetPublicKeyFromASCIIString(
+    origin_trial_policy_.SetPublicKeyFromASCIIString(
         command_line->GetSwitchValueASCII(switches::kOriginTrialPublicKey));
   }
   if (command_line->HasSwitch(switches::kOriginTrialDisabledFeatures)) {
-    origin_trial_key_manager()->SetDisabledFeatures(
-        command_line->GetSwitchValueASCII(
-            switches::kOriginTrialDisabledFeatures));
+    origin_trial_policy_.SetDisabledFeatures(command_line->GetSwitchValueASCII(
+        switches::kOriginTrialDisabledFeatures));
   }
 }
 
+const content::OriginTrialPolicy* ChromeContentClient::GetOriginTrialPolicy()
+    const {
+  return &origin_trial_policy_;
+}
+
 #if defined(OS_ANDROID)
 media::MediaClientAndroid* ChromeContentClient::GetMediaClientAndroid() {
   return new ChromeMediaClientAndroid();