Index: chrome/common/chrome_content_client.cc |
diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc |
index f4414936e8e0e89a3495aec4073693e75ea35484..a476bd4a89b76c140cb658dae7806b95ddd8d047 100644 |
--- a/chrome/common/chrome_content_client.cc |
+++ b/chrome/common/chrome_content_client.cc |
@@ -700,8 +700,19 @@ bool ChromeContentClient::IsSupplementarySiteIsolationModeEnabled() { |
#endif |
} |
-base::StringPiece ChromeContentClient::GetOriginTrialPublicKey() { |
- return origin_trial_key_manager_.GetPublicKey(); |
+void ChromeContentClient::InitializeOriginTrialPolicy() { |
+ // Set the public key 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_policy_.SetPublicKeyFromASCIIString( |
+ command_line->GetSwitchValueASCII(switches::kOriginTrialPublicKey)); |
+ } |
+} |
+ |
+const content::OriginTrialPolicy* ChromeContentClient::GetOriginTrialPolicy() |
+ const { |
+ return &origin_trial_policy_; |
} |
#if defined(OS_ANDROID) |