Settings: Make Enable DRM checkbox available on all platforms

chrome/browser/ui/webui/options/content_settings_handler.cc

Index: chrome/browser/ui/webui/options/content_settings_handler.cc
diff --git a/chrome/browser/ui/webui/options/content_settings_handler.cc b/chrome/browser/ui/webui/options/content_settings_handler.cc
index e98857f9c9c0bdb8713ba965e5d94a789072759b..2a87fc429d2592a183a25f4da78ce675f24a8c05 100644
--- a/chrome/browser/ui/webui/options/content_settings_handler.cc
+++ b/chrome/browser/ui/webui/options/content_settings_handler.cc
@@ -419,11 +419,11 @@ void ContentSettingsHandler::GetLocalizedValues(
     {"notificationsAllow", IDS_NOTIFICATIONS_ALLOW_RADIO},
     {"notificationsAsk", IDS_NOTIFICATIONS_ASK_RADIO},
     {"notificationsBlock", IDS_NOTIFICATIONS_BLOCK_RADIO},
-#if defined(OS_CHROMEOS) || defined(OS_WIN)
     // Protected Content filter
     {"protectedContentTabLabel", IDS_PROTECTED_CONTENT_TAB_LABEL},
     {"protectedContentInfo", IDS_PROTECTED_CONTENT_INFO},
     {"protectedContentEnable", IDS_PROTECTED_CONTENT_ENABLE},
+#if defined(OS_CHROMEOS)
     {"protectedContentHeader", IDS_PROTECTED_CONTENT_HEADER},

[stevenjb, 2017/02/07 21:43:52]

This appears to be unused in the code, as does the IDS, we should remove both.

[tommycli, 2017/02/07 22:11:44]

Hey, it's used here:
https://cs.chromium.org/chromium/src/chrome/browser/resources/options/content...

I tested it. It doesn't work if i remove this line.

[stevenjb, 2017/02/07 22:15:05]

Oh, ugh. That's the problem with generated ids. And that's only used by Chrome
OS? Given that that code is general purpose, it might be safer just to make this
string non cros specific also?

[tommycli, 2017/02/07 22:19:50]

Sure. I made the string crossplatform as well.

 #endif  // defined(OS_CHROMEOS) || defined(OS_WIN)
     // Microphone filter.