[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.CommandLineFlags;
 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 {
 
     @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 41 matching lines @@
                 assertFalse(onOffSwitch.isChecked());
             }
         });
     }
 
     /**
      * Ensure that the "Auto Sign-in" switch in "Save Passwords" settings actually enables and
      * disables auto sign-in.
      */
     @SmallTest
+    @CommandLineFlags.Add("enable-features=" + SavePasswordsPreferences.CREDENTIAL_MANAGER_API)
     @Feature({"Preferences"})
     public void testAutoSignInCheckbox() throws Exception {
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
                 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));
+                assertTrue(ChromeFeatureList.isEnabled(
+                        SavePasswordsPreferences.CREDENTIAL_MANAGER_API));
                 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));
+                assertTrue(ChromeFeatureList.isEnabled(
+                        SavePasswordsPreferences.CREDENTIAL_MANAGER_API));
                 SavePasswordsPreferences passwordPrefs =
                         (SavePasswordsPreferences) preferences2.getFragmentForTest();
                 ChromeBaseCheckBoxPreference onOffSwitch =
                         (ChromeBaseCheckBoxPreference) passwordPrefs.findPreference(
                                 SavePasswordsPreferences.PREF_AUTOSIGNIN_SWITCH);
                 assertFalse(onOffSwitch.isChecked());
             }
         });
     }
 }