Unregister Images, Plugins and Mouselock content settings on android

components/content_settings/core/browser/content_settings_utils.cc

Index: components/content_settings/core/browser/content_settings_utils.cc
diff --git a/components/content_settings/core/browser/content_settings_utils.cc b/components/content_settings/core/browser/content_settings_utils.cc
index 6bae3d8fcacb98411f2b06a921257cf68a1093ae..c58163250c1449f77b40bbdb1c6a18df3a7a6bcf 100644
--- a/components/content_settings/core/browser/content_settings_utils.cc
+++ b/components/content_settings/core/browser/content_settings_utils.cc
@@ -133,10 +133,21 @@ std::unique_ptr<base::Value> ContentSettingToValue(ContentSetting setting) {
 
 void GetRendererContentSettingRules(const HostContentSettingsMap* map,
                                     RendererContentSettingRules* rules) {
+#if !defined(OS_ANDROID)
   map->GetSettingsForOneType(
       CONTENT_SETTINGS_TYPE_IMAGES,
       ResourceIdentifier(),
       &(rules->image_rules));
+#else
+  // Android doesn't use image content settings, so ALLOW rule is added for
+  // all origins.
+  rules->image_rules.push_back(
+      ContentSettingPatternSource(ContentSettingsPattern::Wildcard(),
+                                  ContentSettingsPattern::Wildcard(),
+                                  CONTENT_SETTING_ALLOW,
+                                  std::string(),
+                                  map->is_off_the_record()));
+#endif
   map->GetSettingsForOneType(
       CONTENT_SETTINGS_TYPE_JAVASCRIPT,
       ResourceIdentifier(),