| Index: chrome/common/chrome_content_client.cc
|
| diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc
|
| index 571d73729fbadfa4ca26481182d17fb1d53e655b..c2aec354e700f1c6546226895d9585b1523ee656 100644
|
| --- a/chrome/common/chrome_content_client.cc
|
| +++ b/chrome/common/chrome_content_client.cc
|
| @@ -702,6 +702,16 @@ 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_key_manager()->SetPublicKeyFromASCIIString(
|
| + command_line->GetSwitchValueASCII(switches::kOriginTrialPublicKey));
|
| + }
|
| +}
|
| +
|
| #if defined(OS_ANDROID)
|
| media::MediaClientAndroid* ChromeContentClient::GetMediaClientAndroid() {
|
| return new ChromeMediaClientAndroid();
|
|
|