media: Change default protected media identifier setting to ALLOW on Android

On Android, change the default protected media identifier content
setting from ASK to ALLOW. See Bug for more context on this change.

For existing profiles, if user has not changed the setting before (so it
remains the old default which is ASK), the new default value (ALLOW) will
automatically take effect.

If user has changed the setting (the only possibility is BLOCK), this
setting will stay unchanged.

Bug: 854737
Test: Manually tested
Change-Id: I732961672bec453c3e985848f0848b0754f180e9
Reviewed-on: https://chromium-review.googlesource.com/1184509
Commit-Queue: Xiaohan Wang <xhwang@chromium.org>
Reviewed-by: Raymes Khoury <raymes@chromium.org>
Reviewed-by: Martin Šrámek <msramek@chromium.org>
Cr-Commit-Position: refs/heads/master@{#585936}

chrome/browser/permissions/permission_context_base_unittest.cc

@@ -658,7 +658,7 @@ TEST_F(PermissionContextBaseTests, TestNonValidRequestingUrl) {
   TestRequestPermissionInvalidUrl(CONTENT_SETTINGS_TYPE_GEOLOCATION);
   TestRequestPermissionInvalidUrl(CONTENT_SETTINGS_TYPE_NOTIFICATIONS);
   TestRequestPermissionInvalidUrl(CONTENT_SETTINGS_TYPE_MIDI_SYSEX);
-#if defined(OS_ANDROID) || defined(OS_CHROMEOS)
+#if defined(OS_CHROMEOS)
   TestRequestPermissionInvalidUrl(
       CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER);
 #endif

chrome/browser/permissions/permission_manager_unittest.cc

@@ -212,7 +212,7 @@ TEST_F(PermissionManagerTest, GetPermissionStatusDefault) {
   CheckPermissionStatus(PermissionType::GEOLOCATION, PermissionStatus::ASK);
 #if defined(OS_ANDROID)
   CheckPermissionStatus(PermissionType::PROTECTED_MEDIA_IDENTIFIER,
-                        PermissionStatus::ASK);
+                        PermissionStatus::GRANTED);
 #endif
 }
 
@@ -245,7 +245,7 @@ TEST_F(PermissionManagerTest, CheckPermissionResultDefault) {
                         PermissionStatusSource::UNSPECIFIED);
 #if defined(OS_ANDROID)
   CheckPermissionResult(CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER,
-                        CONTENT_SETTING_ASK,
+                        CONTENT_SETTING_ALLOW,
                         PermissionStatusSource::UNSPECIFIED);
 #endif
 }

components/content_settings/core/browser/content_settings_registry.cc

@@ -253,14 +253,25 @@ void ContentSettingsRegistry::Init() {
            ContentSettingsInfo::PERSISTENT);
 
   Register(CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER,
-           "protected-media-identifier", CONTENT_SETTING_ASK,
+           "protected-media-identifier",
+// On Android, the default value is ALLOW. See https://crbug.com/854737 for
+// details. On ChromeOS the default value is still ASK.
+#if defined(OS_ANDROID)
+           CONTENT_SETTING_ALLOW,
+#else
+           CONTENT_SETTING_ASK,
+#endif  // defined(OS_ANDROID)
            WebsiteSettingsInfo::UNSYNCABLE, WhitelistedSchemes(),
            ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK,
                          CONTENT_SETTING_ASK),
            WebsiteSettingsInfo::REQUESTING_ORIGIN_AND_TOP_LEVEL_ORIGIN_SCOPE,
            WebsiteSettingsRegistry::PLATFORM_ANDROID |
                WebsiteSettingsRegistry::PLATFORM_CHROMEOS,
+#if defined(OS_ANDROID)
+           ContentSettingsInfo::INHERIT_IN_INCOGNITO,
+#else
            ContentSettingsInfo::INHERIT_IF_LESS_PERMISSIVE,
+#endif  // defined(OS_ANDROID)
            ContentSettingsInfo::PERSISTENT);
 
   Register(CONTENT_SETTINGS_TYPE_DURABLE_STORAGE, "durable-storage",