OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include <vector> | 5 #include <vector> |
6 | 6 |
7 #include "base/message_loop/message_loop.h" | 7 #include "base/message_loop/message_loop.h" |
8 #include "base/prefs/pref_registry_simple.h" | 8 #include "base/prefs/pref_registry_simple.h" |
9 #include "base/prefs/pref_service.h" | 9 #include "base/prefs/pref_service.h" |
10 #include "base/prefs/testing_pref_service.h" | 10 #include "base/prefs/testing_pref_service.h" |
(...skipping 529 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
540 | 540 |
541 manager()->OnPasswordFormsParsed(observed); // The post-navigation load. | 541 manager()->OnPasswordFormsParsed(observed); // The post-navigation load. |
542 manager()->OnPasswordFormsRendered(observed, | 542 manager()->OnPasswordFormsRendered(observed, |
543 true); // The post-navigation layout. | 543 true); // The post-navigation layout. |
544 } | 544 } |
545 | 545 |
546 TEST_F(PasswordManagerTest, SavingDependsOnManagerEnabledPreference) { | 546 TEST_F(PasswordManagerTest, SavingDependsOnManagerEnabledPreference) { |
547 // Test that saving passwords depends on the password manager enabled | 547 // Test that saving passwords depends on the password manager enabled |
548 // preference. | 548 // preference. |
549 prefs_.SetUserPref(prefs::kPasswordManagerSavingEnabled, | 549 prefs_.SetUserPref(prefs::kPasswordManagerSavingEnabled, |
550 base::Value::CreateBooleanValue(true)); | 550 new base::FundamentalValue(true)); |
551 EXPECT_TRUE(manager()->IsSavingEnabledForCurrentPage()); | 551 EXPECT_TRUE(manager()->IsSavingEnabledForCurrentPage()); |
552 prefs_.SetUserPref(prefs::kPasswordManagerSavingEnabled, | 552 prefs_.SetUserPref(prefs::kPasswordManagerSavingEnabled, |
553 base::Value::CreateBooleanValue(false)); | 553 new base::FundamentalValue(false)); |
554 EXPECT_FALSE(manager()->IsSavingEnabledForCurrentPage()); | 554 EXPECT_FALSE(manager()->IsSavingEnabledForCurrentPage()); |
555 } | 555 } |
556 | 556 |
557 TEST_F(PasswordManagerTest, FillPasswordsOnDisabledManager) { | 557 TEST_F(PasswordManagerTest, FillPasswordsOnDisabledManager) { |
558 // Test fix for issue 158296: Passwords must be filled even if the password | 558 // Test fix for issue 158296: Passwords must be filled even if the password |
559 // manager is disabled. | 559 // manager is disabled. |
560 std::vector<PasswordForm*> result; | 560 std::vector<PasswordForm*> result; |
561 PasswordForm* existing = new PasswordForm(MakeSimpleForm()); | 561 PasswordForm* existing = new PasswordForm(MakeSimpleForm()); |
562 result.push_back(existing); | 562 result.push_back(existing); |
563 prefs_.SetUserPref(prefs::kPasswordManagerSavingEnabled, | 563 prefs_.SetUserPref(prefs::kPasswordManagerSavingEnabled, |
564 base::Value::CreateBooleanValue(false)); | 564 new base::FundamentalValue(false)); |
565 EXPECT_CALL(driver_, FillPasswordForm(_)); | 565 EXPECT_CALL(driver_, FillPasswordForm(_)); |
566 EXPECT_CALL(*store_.get(), | 566 EXPECT_CALL(*store_.get(), |
567 GetLogins(_, testing::Eq(PasswordStore::DISALLOW_PROMPT), _)) | 567 GetLogins(_, testing::Eq(PasswordStore::DISALLOW_PROMPT), _)) |
568 .WillRepeatedly(DoAll(WithArg<2>(InvokeConsumer(result)), Return())); | 568 .WillRepeatedly(DoAll(WithArg<2>(InvokeConsumer(result)), Return())); |
569 std::vector<PasswordForm> observed; | 569 std::vector<PasswordForm> observed; |
570 PasswordForm form(MakeSimpleForm()); | 570 PasswordForm form(MakeSimpleForm()); |
571 observed.push_back(form); | 571 observed.push_back(form); |
572 manager()->OnPasswordFormsParsed(observed); | 572 manager()->OnPasswordFormsParsed(observed); |
573 } | 573 } |
574 | 574 |
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
731 EXPECT_CALL(*store_.get(), AddLogin(FormMatches(form))).Times(Exactly(0)); | 731 EXPECT_CALL(*store_.get(), AddLogin(FormMatches(form))).Times(Exactly(0)); |
732 | 732 |
733 // Submit form and finish navigation. | 733 // Submit form and finish navigation. |
734 manager()->ProvisionallySavePassword(form); | 734 manager()->ProvisionallySavePassword(form); |
735 observed.clear(); | 735 observed.clear(); |
736 manager()->OnPasswordFormsParsed(observed); | 736 manager()->OnPasswordFormsParsed(observed); |
737 manager()->OnPasswordFormsRendered(observed, true); | 737 manager()->OnPasswordFormsRendered(observed, true); |
738 } | 738 } |
739 | 739 |
740 } // namespace password_manager | 740 } // namespace password_manager |
OLD | NEW |