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

chrome/browser/resources/options/content_settings.html

Index: chrome/browser/resources/options/content_settings.html
diff --git a/chrome/browser/resources/options/content_settings.html b/chrome/browser/resources/options/content_settings.html
index 0f49085447f587122c14e8a9e299baed7221b64d..b6906fc2e67a140d7f9e64d9055cda14e6362bd3 100644
--- a/chrome/browser/resources/options/content_settings.html
+++ b/chrome/browser/resources/options/content_settings.html
@@ -304,19 +304,27 @@
         </div>
       </div>
     </section>
-<if expr="chromeos or is_win">
     <!-- Protected Content filter -->
     <section guest-visibility="disabled">
       <h3 i18n-content="protectedContentTabLabel"
           class="content-settings-header"></h3>
       <div>
+        <div class="checkbox">
+          <label>
+            <input pref="webkit.webprefs.encrypted_media_enabled"
+                type="checkbox">
+            <span i18n-content="protectedContentEnableCheckbox"></span>
+          </label>
+        </div>
+<if expr="chromeos or is_win">
         <div class="settings-row">
           <p i18n-content="protectedContentInfo"></p>
         </div>
         <div class="checkbox">
           <label>
             <input pref="settings.privacy.drm_enabled" type="checkbox">
-            <span i18n-content="protectedContentEnable"></span>
+            <span i18n-content="protectedContentEnableIdentifiersCheckbox">
+            </span>
           </label>
         </div>
   <if expr="chromeos">
@@ -326,9 +334,9 @@
               i18n-content="manageExceptions"></button>
         </div>
   </if>
+</if>

[stevenjb, 2017/02/08 20:24:36]

I think it would be more clear if this </if> was above line 330 (<if
expr="chromeos">) and that <if> was unnested / unindented.

[tommycli, 2017/02/08 20:54:18]

Done.

       </div>
     </section>
-</if>
     <!-- Microphone filter -->
     <section id="media-stream-mic">
       <h3 i18n-content="mediaStreamMicTabLabel"></h3>