Unregister Images, Plugins and Mouselock content settings on android

chrome/browser/android/preferences/pref_service_bridge.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/android/preferences/pref_service_bridge.h"
 
 #include <jni.h>
 #include <stddef.h>
 
 #include <memory>
@@ skipping 138 matching lines @@
       static_cast<ContentSettingsType>(content_settings_type);
   return GetBooleanForContentSetting(type);
 }
 
 static void SetContentSettingEnabled(JNIEnv* env,
                                      const JavaParamRef<jobject>& obj,
                                      int content_settings_type,
                                      jboolean allow) {
   // Before we migrate functions over to this central function, we must verify
   // that the new category supports ALLOW/BLOCK pairs and, if not, handle them.
-  // IMAGES is included to allow migrating the setting back for users who had
-  // disabled images in M44 (see https://crbug.com/505844).
-  // TODO(bauerb): Remove this when the migration code is removed.
   DCHECK(content_settings_type == CONTENT_SETTINGS_TYPE_JAVASCRIPT ||
-         content_settings_type == CONTENT_SETTINGS_TYPE_POPUPS ||
-         content_settings_type == CONTENT_SETTINGS_TYPE_IMAGES);
+         content_settings_type == CONTENT_SETTINGS_TYPE_POPUPS);
+
   HostContentSettingsMap* host_content_settings_map =
       HostContentSettingsMapFactory::GetForProfile(GetOriginalProfile());
   host_content_settings_map->SetDefaultContentSetting(
       static_cast<ContentSettingsType>(content_settings_type),
       allow ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK);
 }
 
 static void SetContentSettingForPattern(JNIEnv* env,
                                         const JavaParamRef<jobject>& obj,
                                         int content_settings_type,
@@ skipping 968 matching lines @@
 
   return ConvertJavaStringToUTF8(android_permission);
 }
 
 static void SetSupervisedUserId(JNIEnv* env,
                                 const JavaParamRef<jobject>& obj,
                                 const JavaParamRef<jstring>& pref) {
   GetPrefService()->SetString(prefs::kSupervisedUserId,
                               ConvertJavaStringToUTF8(env, pref));
 }