| Index: chrome/renderer/chrome_content_renderer_client.cc
|
| diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
|
| index cdd2ba479905b9a718c535d618177326bf915c68..a1f6ddc360cf4938800a5a7699c504ffc3c2b4d9 100644
|
| --- a/chrome/renderer/chrome_content_renderer_client.cc
|
| +++ b/chrome/renderer/chrome_content_renderer_client.cc
|
| @@ -321,6 +321,11 @@ ChromeContentRendererClient::ChromeContentRendererClient()
|
| origin_trial_key_manager_.SetPublicKeyFromASCIIString(
|
| command_line->GetSwitchValueASCII(switches::kOriginTrialPublicKey));
|
| }
|
| + if (command_line->HasSwitch(switches::kOriginTrialDisabledFeatures)) {
|
| + origin_trial_key_manager_.SetDisabledFeatures(
|
| + command_line->GetSwitchValueASCII(
|
| + switches::kOriginTrialDisabledFeatures));
|
| + }
|
| }
|
|
|
| ChromeContentRendererClient::~ChromeContentRendererClient() {
|
| @@ -1431,3 +1436,8 @@ bool ChromeContentRendererClient::ShouldEnforceWebRTCRoutingPreferences() {
|
| base::StringPiece ChromeContentRendererClient::GetOriginTrialPublicKey() {
|
| return origin_trial_key_manager_.GetPublicKey();
|
| }
|
| +
|
| +bool ChromeContentRendererClient::IsOriginTrialFeatureDisabled(
|
| + const std::string& feature) {
|
| + return origin_trial_key_manager_.IsFeatureDisabled(feature);
|
| +}
|
|
|