| Index: chrome/browser/password_manager/chrome_password_manager_client_unittest.cc
|
| diff --git a/chrome/browser/password_manager/chrome_password_manager_client_unittest.cc b/chrome/browser/password_manager/chrome_password_manager_client_unittest.cc
|
| index 09a7aed860ae941fee3c9db5c6a6bc0cd8425a13..df6f06ed08b0eb742120af71e2f282b941af3c46 100644
|
| --- a/chrome/browser/password_manager/chrome_password_manager_client_unittest.cc
|
| +++ b/chrome/browser/password_manager/chrome_password_manager_client_unittest.cc
|
| @@ -55,13 +55,6 @@ using testing::_;
|
|
|
| namespace {
|
|
|
| -const char kPasswordManagerSettingsBehaviourChangeFieldTrialName[] =
|
| - "PasswordManagerSettingsBehaviourChange";
|
| -const char kPasswordManagerSettingsBehaviourChangeEnabledGroupName[] =
|
| - "PasswordManagerSettingsBehaviourChange.Active";
|
| -const char kPasswordManagerSettingsBehaviourChangeDisabledGroupName[] =
|
| - "PasswordManagerSettingsBehaviourChange.NotActive";
|
| -
|
| // TODO(vabr): Get rid of the mocked client in the client's own test, see
|
| // http://crbug.com/474577.
|
| class MockChromePasswordManagerClient : public ChromePasswordManagerClient {
|
| @@ -151,12 +144,6 @@ class ChromePasswordManagerClientTest : public ChromeRenderViewHostTestHarness {
|
| return profile()->GetTestingPrefService();
|
| }
|
|
|
| - void EnforcePasswordManagerSettingsBehaviourChangeExperimentGroup(
|
| - const char* name) {
|
| - ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
|
| - kPasswordManagerSettingsBehaviourChangeFieldTrialName, name));
|
| - }
|
| -
|
| // Caller does not own the returned pointer.
|
| ProfileSyncServiceMock* SetupBasicMockSync() {
|
| ProfileSyncServiceMock* mock_sync_service =
|
| @@ -340,38 +327,6 @@ TEST_F(ChromePasswordManagerClientTest,
|
| EXPECT_FALSE(client->IsSavingAndFillingEnabledForCurrentPage());
|
| }
|
|
|
| -TEST_F(ChromePasswordManagerClientTest,
|
| - FillingDependsOnManagerEnabledPreferenceAndExperimentEnabled) {
|
| - // Test that filing of passwords depends on the password manager enabled
|
| - // preference and is the user participated in behavior change experiment.
|
| - ChromePasswordManagerClient* client = GetClient();
|
| - EnforcePasswordManagerSettingsBehaviourChangeExperimentGroup(
|
| - kPasswordManagerSettingsBehaviourChangeEnabledGroupName);
|
| - prefs()->SetUserPref(password_manager::prefs::kPasswordManagerSavingEnabled,
|
| - new base::FundamentalValue(true));
|
| - EXPECT_TRUE(client->IsSavingAndFillingEnabledForCurrentPage());
|
| - EXPECT_TRUE(client->IsFillingEnabledForCurrentPage());
|
| - prefs()->SetUserPref(password_manager::prefs::kPasswordManagerSavingEnabled,
|
| - new base::FundamentalValue(false));
|
| - EXPECT_FALSE(client->IsSavingAndFillingEnabledForCurrentPage());
|
| - EXPECT_FALSE(client->IsFillingEnabledForCurrentPage());
|
| -}
|
| -
|
| -TEST_F(ChromePasswordManagerClientTest,
|
| - FillingDependsOnManagerEnabledPreferenceAndExperimentDisabled) {
|
| - // Test that filing of passwords depends on the password manager enabled
|
| - // preference and is the user participated in behavior change experiment.
|
| - ChromePasswordManagerClient* client = GetClient();
|
| - EnforcePasswordManagerSettingsBehaviourChangeExperimentGroup(
|
| - kPasswordManagerSettingsBehaviourChangeDisabledGroupName);
|
| - prefs()->SetUserPref(password_manager::prefs::kPasswordManagerSavingEnabled,
|
| - new base::FundamentalValue(true));
|
| - EXPECT_TRUE(client->IsFillingEnabledForCurrentPage());
|
| - prefs()->SetUserPref(password_manager::prefs::kPasswordManagerSavingEnabled,
|
| - new base::FundamentalValue(false));
|
| - EXPECT_TRUE(client->IsFillingEnabledForCurrentPage());
|
| -}
|
| -
|
| TEST_F(ChromePasswordManagerClientTest, SavingAndFillingEnabledConditionsTest) {
|
| std::unique_ptr<WebContents> test_web_contents(
|
| content::WebContentsTester::CreateTestWebContents(
|
|
|