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

chrome/android/javatests/src/org/chromium/chrome/browser/preferences/password/SavePasswordsPreferencesTest.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.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();
     }
 
     /**
      * Ensure that the on/off switch in "Save Passwords" settings actually enables and disables
      * password saving.
      */
     @SmallTest
     @Feature({"Preferences"})
     public void testSavePasswordsSwitch() throws Exception {
@@ skipping 56 matching lines @@
                 PrefServiceBridge.getInstance().setPasswordManagerAutoSigninEnabled(true);
             }
         });
 
         final Preferences preferences = PreferencesTest.startPreferences(
                 getInstrumentation(), SavePasswordsPreferences.class.getName());
 
         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 =
                         (ChromeBaseCheckBoxPreference) passwordPrefs.findPreference(
                                 SavePasswordsPreferences.PREF_AUTOSIGNIN_SWITCH);
                 assertTrue(onOffSwitch.isChecked());
 
                 PreferencesTest.clickPreference(passwordPrefs, onOffSwitch);
                 assertFalse(PrefServiceBridge.getInstance().isPasswordManagerAutoSigninEnabled());
                 PreferencesTest.clickPreference(passwordPrefs, onOffSwitch);
                 assertTrue(PrefServiceBridge.getInstance().isPasswordManagerAutoSigninEnabled());
 
                 preferences.finish();
 
                 PrefServiceBridge.getInstance().setPasswordManagerAutoSigninEnabled(false);
             }
         });
 
         final Preferences preferences2 = PreferencesTest.startPreferences(
                 getInstrumentation(), SavePasswordsPreferences.class.getName());
         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 =
                         (ChromeBaseCheckBoxPreference) passwordPrefs.findPreference(
                                 SavePasswordsPreferences.PREF_AUTOSIGNIN_SWITCH);
                 assertFalse(onOffSwitch.isChecked());
             }
         });
     }
 }