Unregister Images, Plugins and Mouselock content settings on android

chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java

 // 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.
 
 package org.chromium.chrome.browser.preferences;
 
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.util.Log;
 
@@ skipping 139 matching lines @@
         if (currentVersion == MIGRATION_CURRENT_VERSION) return;
         if (currentVersion > MIGRATION_CURRENT_VERSION) {
             Log.e(LOG_TAG, "Saved preferences version is newer than supported.  Attempting to "
                     + "run an older version of Chrome without clearing data is unsupported and "
                     + "the results may be unpredictable.");
         }
 
         if (currentVersion < 1) {
             nativeMigrateJavascriptPreference();
         }
-        // Steps 2,3 intentionally skipped.

[Bernhard Bauer, 2016/06/09 08:55:45]

Keep this comment and include step 4?

-        if (currentVersion < 4) {
-            // For a brief period (M44 Beta), it was possible for users to disable images via Site
-            // Settings. Now that this option has been removed, ensure that users are not stuck with
-            // images disabled.
-            setContentSettingEnabled(ContentSettingsType.CONTENT_SETTINGS_TYPE_IMAGES, true);
-        }
         preferences.edit().putInt(MIGRATION_PREF_KEY, MIGRATION_CURRENT_VERSION).apply();
     }
 
     /**
      * Add a permission entry for Location for the default search engine.
      * @param allowed Whether to create an Allowed permission or a Denied permission.
      * @param context The current context to use.
      */
     public static void maybeCreatePermissionForDefaultSearchEngine(
             boolean allowed, Context context) {
@@ skipping 1020 matching lines @@
     private native String nativeGetSupervisedUserSecondCustodianProfileImageURL();
     private native boolean nativeGetMetricsReportingEnabled();
     private native void nativeSetMetricsReportingEnabled(boolean enabled);
     private native boolean nativeHasSetMetricsReporting();
     private native void nativeSetClickedUpdateMenuItem(boolean clicked);
     private native boolean nativeGetClickedUpdateMenuItem();
     private native void nativeSetLatestVersionWhenClickedUpdateMenuItem(String version);
     private native String nativeGetLatestVersionWhenClickedUpdateMenuItem();
     private native void nativeSetSupervisedUserId(String supervisedUserId);
 }