| Index: components/password_manager/core/browser/password_manager_unittest.cc
|
| diff --git a/components/password_manager/core/browser/password_manager_unittest.cc b/components/password_manager/core/browser/password_manager_unittest.cc
|
| index 7b95a3c32cb87489efb56d97dfd9a5dc4551fcf2..a277cc4f251740a57e89169ed06584120cc71599 100644
|
| --- a/components/password_manager/core/browser/password_manager_unittest.cc
|
| +++ b/components/password_manager/core/browser/password_manager_unittest.cc
|
| @@ -75,7 +75,7 @@ class TestPasswordManager : public PasswordManager {
|
| class PasswordManagerTest : public testing::Test {
|
| protected:
|
| virtual void SetUp() {
|
| - prefs_.registry()->RegisterBooleanPref(prefs::kPasswordManagerEnabled,
|
| + prefs_.registry()->RegisterBooleanPref(prefs::kPasswordManagerSavingEnabled,
|
| true);
|
|
|
| store_ = new MockPasswordStore;
|
| @@ -481,10 +481,10 @@ TEST_F(PasswordManagerTest, InitiallyInvisibleForm) {
|
| TEST_F(PasswordManagerTest, SavingDependsOnManagerEnabledPreference) {
|
| // Test that saving passwords depends on the password manager enabled
|
| // preference.
|
| - prefs_.SetUserPref(prefs::kPasswordManagerEnabled,
|
| + prefs_.SetUserPref(prefs::kPasswordManagerSavingEnabled,
|
| base::Value::CreateBooleanValue(true));
|
| EXPECT_TRUE(manager()->IsSavingEnabledForCurrentPage());
|
| - prefs_.SetUserPref(prefs::kPasswordManagerEnabled,
|
| + prefs_.SetUserPref(prefs::kPasswordManagerSavingEnabled,
|
| base::Value::CreateBooleanValue(false));
|
| EXPECT_FALSE(manager()->IsSavingEnabledForCurrentPage());
|
| }
|
| @@ -495,7 +495,7 @@ TEST_F(PasswordManagerTest, FillPasswordsOnDisabledManager) {
|
| std::vector<PasswordForm*> result;
|
| PasswordForm* existing = new PasswordForm(MakeSimpleForm());
|
| result.push_back(existing);
|
| - prefs_.SetUserPref(prefs::kPasswordManagerEnabled,
|
| + prefs_.SetUserPref(prefs::kPasswordManagerSavingEnabled,
|
| base::Value::CreateBooleanValue(false));
|
| EXPECT_CALL(driver_, FillPasswordForm(_));
|
| EXPECT_CALL(*store_.get(),
|
|
|