The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/239f8c5202eb155ff3bc22dbc1db77c0753497fa

commit 239f8c5202eb155ff3bc22dbc1db77c0753497fa
Author: tommycli <tommycli@chromium.org>
Date: Wed Feb 08 22:20:47 2017

Settings: Add a new Enable Protected Content checkbox on all platforms

This CL adds a new checkbox for the new WebKit preference to enable
HTML5 Encrypted Media / DRM.

BUG= 690077 
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation

Review-Url: https://codereview.chromium.org/2682653005
Cr-Commit-Position: refs/heads/master@{#449105}

[modify] https://crrev.com/239f8c5202eb155ff3bc22dbc1db77c0753497fa/chrome/app/generated_resources.grd
[modify] https://crrev.com/239f8c5202eb155ff3bc22dbc1db77c0753497fa/chrome/browser/resources/options/content_settings.html
[modify] https://crrev.com/239f8c5202eb155ff3bc22dbc1db77c0753497fa/chrome/browser/ui/webui/options/content_settings_handler.cc

Requesting a merge to 57 after baking into Canary.

Approving merge to M57 Chrome OS.

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/157d48c67f0547e452a75d693abd8e9edaa7c6c8

commit 157d48c67f0547e452a75d693abd8e9edaa7c6c8
Author: Tommy C. Li <tommycli@chromium.org>
Date: Thu Feb 09 20:24:32 2017

Settings: Add a new Enable Protected Content checkbox on all platforms

This CL adds a new checkbox for the new WebKit preference to enable
HTML5 Encrypted Media / DRM.

BUG= 690077 
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation

Review-Url: https://codereview.chromium.org/2682653005
Cr-Commit-Position: refs/heads/master@{#449105}
(cherry picked from commit 239f8c5202eb155ff3bc22dbc1db77c0753497fa)

Review-Url: https://codereview.chromium.org/2686173002 .
Cr-Commit-Position: refs/branch-heads/2987@{#415}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}

[modify] https://crrev.com/157d48c67f0547e452a75d693abd8e9edaa7c6c8/chrome/app/generated_resources.grd
[modify] https://crrev.com/157d48c67f0547e452a75d693abd8e9edaa7c6c8/chrome/browser/resources/options/content_settings.html
[modify] https://crrev.com/157d48c67f0547e452a75d693abd8e9edaa7c6c8/chrome/browser/ui/webui/options/content_settings_handler.cc