[Smart Lock, UI] Fix dissapeared Auto-signin setting.

chrome/android/java/src/org/chromium/chrome/browser/preferences/password/SavePasswordsPreferences.java

Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/password/SavePasswordsPreferences.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/password/SavePasswordsPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/password/SavePasswordsPreferences.java
index 02dd8b8092541e5fa758fea016668c1525b33249..cd16fbbd5fd712e2d9c2fb5c3aba05d97fac4980 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/password/SavePasswordsPreferences.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/password/SavePasswordsPreferences.java
@@ -20,8 +20,9 @@ import android.view.ViewGroup;
 import android.widget.TextView;
 
 import org.chromium.base.ApiCompatibilityUtils;
-import org.chromium.base.CommandLine;
+import org.chromium.base.VisibleForTesting;
 import org.chromium.chrome.R;
+import org.chromium.chrome.browser.ChromeFeatureList;
 import org.chromium.chrome.browser.PasswordUIView;
 import org.chromium.chrome.browser.PasswordUIView.PasswordListObserver;
 import org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference;
@@ -31,7 +32,6 @@ import org.chromium.chrome.browser.preferences.ManagedPreferenceDelegate;
 import org.chromium.chrome.browser.preferences.PrefServiceBridge;
 import org.chromium.chrome.browser.preferences.Preferences;
 import org.chromium.chrome.browser.preferences.PreferencesLauncher;
-import org.chromium.content.common.ContentSwitches;
 import org.chromium.ui.text.SpanApplier;
 
 /**
@@ -52,6 +52,9 @@ public class SavePasswordsPreferences extends PreferenceFragment
     public static final String PREF_SAVE_PASSWORDS_SWITCH = "save_passwords_switch";
     public static final String PREF_AUTOSIGNIN_SWITCH = "autosignin_switch";
 
+    @VisibleForTesting
+    public static final String ENABLE_CREDENTIAL_MANAGER_API = "CredentialManagementAPI";

[Bernhard Bauer, 2016/04/20 10:10:11]

Nit: This is the name of the feature, so the ENABLE_ prefix is unnecessary /
potentially confusing.

[melandory, 2016/04/21 10:42:24]

Done.

+
     private static final String PREF_CATEGORY_SAVED_PASSWORDS = "saved_passwords";
     private static final String PREF_CATEGORY_EXCEPTIONS = "exceptions";
     private static final String PREF_MANAGE_ACCOUNT_LINK = "manage_account_link";
@@ -257,7 +260,7 @@ public class SavePasswordsPreferences extends PreferenceFragment
     }
 
     private void createAutoSignInCheckbox() {
-        if (!CommandLine.getInstance().hasSwitch(ContentSwitches.ENABLE_CREDENTIAL_MANAGER_API)) {
+        if (!ChromeFeatureList.isEnabled(ENABLE_CREDENTIAL_MANAGER_API)) {
             return;
         }
         mAutoSignInSwitch = new ChromeBaseCheckBoxPreference(getActivity(), null);