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

chrome/android/javatests/src/org/chromium/chrome/browser/preferences/password/SavePasswordsPreferencesTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/preferences/password/SavePasswordsPreferencesTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/password/SavePasswordsPreferencesTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/password/SavePasswordsPreferencesTest.java
index 8b2d3b1a63dd9388c0cfdae5b70df626fab0d21d..b154f7b27fd5b4f0f8da7d24774e66e640b6b0d2 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/password/SavePasswordsPreferencesTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/password/SavePasswordsPreferencesTest.java
@@ -6,26 +6,26 @@ package org.chromium.chrome.browser.preferences.password;
 
 import android.test.suitebuilder.annotation.SmallTest;
 
-import org.chromium.base.CommandLine;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.Feature;
+import org.chromium.chrome.browser.ChromeFeatureList;
 import org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference;
 import org.chromium.chrome.browser.preferences.ChromeSwitchPreference;
 import org.chromium.chrome.browser.preferences.PrefServiceBridge;
 import org.chromium.chrome.browser.preferences.Preferences;
 import org.chromium.chrome.browser.preferences.PreferencesTest;
 import org.chromium.content.browser.test.NativeLibraryTestBase;
-import org.chromium.content.common.ContentSwitches;
 
 /**
  * Tests for the "Save Passwords" settings screen.
  */
 public class SavePasswordsPreferencesTest extends NativeLibraryTestBase {
 
+    private static final String ENABLE_CREDENTIAL_MANAGER_API = "CredentialManagementAPI";

[Bernhard Bauer, 2016/04/13 14:23:01]

Declaring this constant multiple times defeats the purpose of having a constant
in the first place 😃

[melandory, 2016/04/14 11:23:01]

I haven't fount the right place where to put it. Does ChromeSwitches sounds too
bad?

[Bernhard Bauer, 2016/04/14 11:27:38]

It's not a switch.

Can you just use the one from SavePasswordsPreferences?

+
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        CommandLine.getInstance().appendSwitch(ContentSwitches.ENABLE_CREDENTIAL_MANAGER_API);
         loadNativeLibraryAndInitBrowserProcess();
     }
 
@@ -102,8 +102,9 @@ public class SavePasswordsPreferencesTest extends NativeLibraryTestBase {
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
-                assertTrue(CommandLine.getInstance().hasSwitch(
-                        ContentSwitches.ENABLE_CREDENTIAL_MANAGER_API));
+                if (!ChromeFeatureList.isEnabled(ENABLE_CREDENTIAL_MANAGER_API)) {

[Bernhard Bauer, 2016/04/13 14:23:01]

Wouldn't it be a better idea to force-enable this feature for the test? If you
want to get real fancy, you could even implement a test annotation that does
that (ask dgn@ how).

[Bernhard Bauer, 2016/04/13 14:26:31]

So, it turns out there is already
@CommandLineFlags.Add("enable-features=<Feature>"), which is probably close
enough not to warrant a separate annotation.

+                    return;
+                }
                 SavePasswordsPreferences passwordPrefs =
                         (SavePasswordsPreferences) preferences.getFragmentForTest();
                 ChromeBaseCheckBoxPreference onOffSwitch =
@@ -127,8 +128,9 @@ public class SavePasswordsPreferencesTest extends NativeLibraryTestBase {
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
-                assertTrue(CommandLine.getInstance().hasSwitch(
-                        ContentSwitches.ENABLE_CREDENTIAL_MANAGER_API));
+                if (!ChromeFeatureList.isEnabled(ENABLE_CREDENTIAL_MANAGER_API)) {
+                    return;
+                }
                 SavePasswordsPreferences passwordPrefs =
                         (SavePasswordsPreferences) preferences2.getFragmentForTest();
                 ChromeBaseCheckBoxPreference onOffSwitch =