Index: components/password_manager/sync/browser/sync_credentials_filter_unittest.cc |
diff --git a/components/password_manager/sync/browser/sync_credentials_filter_unittest.cc b/components/password_manager/sync/browser/sync_credentials_filter_unittest.cc |
index cc43857f56f56f3d40e60d7a36ccf667d97bc4f3..a49daeede85d356d54c5b2c02465f06a84d59f75 100644 |
--- a/components/password_manager/sync/browser/sync_credentials_filter_unittest.cc |
+++ b/components/password_manager/sync/browser/sync_credentials_filter_unittest.cc |
@@ -9,13 +9,13 @@ |
#include "base/bind.h" |
#include "base/bind_helpers.h" |
-#include "base/command_line.h" |
#include "base/macros.h" |
#include "base/test/histogram_tester.h" |
#include "base/test/user_action_tester.h" |
#include "components/autofill/core/common/password_form.h" |
+#include "components/password_manager/core/browser/password_manager_test_utils.h" |
#include "components/password_manager/core/browser/stub_password_manager_client.h" |
-#include "components/password_manager/core/common/password_manager_switches.h" |
+#include "components/password_manager/core/common/password_manager_features.h" |
#include "components/password_manager/sync/browser/sync_username_test_base.h" |
#include "testing/gtest/include/gtest/gtest.h" |
@@ -135,9 +135,10 @@ TEST_F(CredentialsFilterTest, FilterResults_AllowAll) { |
} |
TEST_F(CredentialsFilterTest, FilterResults_DisallowSyncOnReauth) { |
- base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); |
- command_line->AppendSwitch( |
- switches::kDisallowAutofillSyncCredentialForReauth); |
+ // Only 'protect-sync-credential-on-reauth' feature is kept enabled, fill the |
+ // sync credential everywhere but on reauth. |
+ EnableFeature(features::kProtectSyncCredential, false, false); |
+ EnableFeature(features::kProtectSyncCredentialOnReauth, true, true); |
const TestCase kTestCases[] = { |
// Reauth URL, not sync username. |
@@ -176,8 +177,10 @@ TEST_F(CredentialsFilterTest, FilterResults_DisallowSyncOnReauth) { |
} |
TEST_F(CredentialsFilterTest, FilterResults_DisallowSync) { |
- base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); |
- command_line->AppendSwitch(switches::kDisallowAutofillSyncCredential); |
+ // Both features are kept enabled, should cause sync credential to be |
+ // filtered. |
+ EnableFeature(features::kProtectSyncCredential, true, false); |
+ EnableFeature(features::kProtectSyncCredentialOnReauth, true, true); |
const TestCase kTestCases[] = { |
// Reauth URL, not sync username. |
@@ -248,9 +251,10 @@ TEST_F(CredentialsFilterTest, ShouldSave_SyncCredential_NotSyncingPasswords) { |
} |
TEST_F(CredentialsFilterTest, ShouldFilterOneForm) { |
- // Adding disallow switch should cause sync credential to be filtered. |
- base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); |
- command_line->AppendSwitch(switches::kDisallowAutofillSyncCredential); |
+ // Both features are kept enabled, should cause sync credential to be |
+ // filtered. |
+ EnableFeature(features::kProtectSyncCredential, true, false); |
+ EnableFeature(features::kProtectSyncCredentialOnReauth, true, true); |
ScopedVector<autofill::PasswordForm> results; |
results.push_back(new PasswordForm(SimpleGaiaForm("test1@gmail.com"))); |