ScreenCapture for Android phase1, part II

components/content_settings/core/browser/content_settings_registry.cc

Index: components/content_settings/core/browser/content_settings_registry.cc
diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
index 240243d1961e0ca1e04543ead37b120323dab534..8f7d37fd68e5f1729a39656c1b655a2f7c4b28d3 100644
--- a/components/content_settings/core/browser/content_settings_registry.cc
+++ b/components/content_settings/core/browser/content_settings_registry.cc
@@ -335,6 +335,13 @@ void ContentSettingsRegistry::Init() {
            WebsiteSettingsRegistry::DESKTOP |
                WebsiteSettingsRegistry::PLATFORM_ANDROID,
            ContentSettingsInfo::INHERIT_IN_INCOGNITO);
+
+  Register(CONTENT_SETTINGS_TYPE_MEDIASTREAM_SCREEN, "media-stream-screen",

[Sergey Ulanov, 2016/08/01 18:20:36]

Do we need to register it when the feature is not enabled?

[braveyao, 2016/08/03 00:23:47]

This setting is invisible to users. Should be OK.

+           CONTENT_SETTING_DEFAULT, WebsiteSettingsInfo::UNSYNCABLE,
+           WhitelistedSchemes(), ValidSettings(),
+           WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE,
+           WebsiteSettingsRegistry::PLATFORM_ANDROID,
+           ContentSettingsInfo::INHERIT_IN_INCOGNITO);
 }
 
 void ContentSettingsRegistry::Register(