OLD | NEW |
---|---|
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "base/bind.h" | 5 #include "base/bind.h" |
6 #include "base/prefs/pref_service.h" | 6 #include "base/prefs/pref_service.h" |
7 #include "base/strings/utf_string_conversions.h" | 7 #include "base/strings/utf_string_conversions.h" |
8 #include "base/time/time.h" | 8 #include "base/time/time.h" |
9 #include "chrome/browser/ui/passwords/manage_passwords_bubble.h" | 9 #include "chrome/browser/ui/passwords/manage_passwords_bubble.h" |
10 #include "chrome/browser/ui/passwords/manage_passwords_bubble_model.h" | 10 #include "chrome/browser/ui/passwords/manage_passwords_bubble_model.h" |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
44 | 44 |
45 base::TimeDelta Elapsed() const override; | 45 base::TimeDelta Elapsed() const override; |
46 void SetElapsed(base::TimeDelta elapsed) { elapsed_ = elapsed; } | 46 void SetElapsed(base::TimeDelta elapsed) { elapsed_ = elapsed; } |
47 | 47 |
48 using ManagePasswordsUIController::DidNavigateMainFrame; | 48 using ManagePasswordsUIController::DidNavigateMainFrame; |
49 | 49 |
50 private: | 50 private: |
51 void UpdateBubbleAndIconVisibility() override; | 51 void UpdateBubbleAndIconVisibility() override; |
52 void UpdateAndroidAccountChooserInfoBarVisibility() override; | 52 void UpdateAndroidAccountChooserInfoBarVisibility() override; |
53 void SavePasswordInternal() override {} | 53 void SavePasswordInternal() override {} |
54 void UpdatePasswordInternal( | |
55 const autofill::PasswordForm& password_form) override {} | |
54 void NeverSavePasswordInternal() override; | 56 void NeverSavePasswordInternal() override; |
55 | 57 |
56 base::TimeDelta elapsed_; | 58 base::TimeDelta elapsed_; |
57 }; | 59 }; |
58 | 60 |
59 TestManagePasswordsUIController::TestManagePasswordsUIController( | 61 TestManagePasswordsUIController::TestManagePasswordsUIController( |
60 content::WebContents* contents, | 62 content::WebContents* contents, |
61 password_manager::PasswordManagerClient* client) | 63 password_manager::PasswordManagerClient* client) |
62 : ManagePasswordsUIController(contents) { | 64 : ManagePasswordsUIController(contents) { |
63 // Do not silently replace an existing ManagePasswordsUIController because it | 65 // Do not silently replace an existing ManagePasswordsUIController because it |
(...skipping 481 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
545 autofill::PasswordFormMap map; | 547 autofill::PasswordFormMap map; |
546 scoped_ptr<autofill::PasswordForm> psl_matched_test_form( | 548 scoped_ptr<autofill::PasswordForm> psl_matched_test_form( |
547 new autofill::PasswordForm(test_local_form())); | 549 new autofill::PasswordForm(test_local_form())); |
548 psl_matched_test_form->original_signon_realm = | 550 psl_matched_test_form->original_signon_realm = |
549 "http://pslmatched.example.com"; | 551 "http://pslmatched.example.com"; |
550 map.insert(kTestUsername, psl_matched_test_form.Pass()); | 552 map.insert(kTestUsername, psl_matched_test_form.Pass()); |
551 controller()->OnPasswordAutofilled(map); | 553 controller()->OnPasswordAutofilled(map); |
552 | 554 |
553 EXPECT_EQ(password_manager::ui::INACTIVE_STATE, controller()->state()); | 555 EXPECT_EQ(password_manager::ui::INACTIVE_STATE, controller()->state()); |
554 } | 556 } |
557 | |
558 TEST_F(ManagePasswordsUIControllerTest, UpdatePasswordSubmitted) { | |
559 scoped_ptr<password_manager::PasswordFormManager> test_form_manager( | |
560 CreateFormManager()); | |
561 controller()->OnUpdatePasswordSubmitted(test_form_manager.Pass()); | |
562 EXPECT_EQ(password_manager::ui::PENDING_PASSWORD_UPDATE_STATE, | |
563 controller()->state()); | |
564 | |
565 ManagePasswordsIconMock mock; | |
566 controller()->UpdateIconAndBubbleState(&mock); | |
567 EXPECT_EQ(password_manager::ui::PENDING_PASSWORD_UPDATE_STATE, mock.state()); | |
568 } | |
569 | |
570 TEST_F(ManagePasswordsUIControllerTest, PasswordUpdated) { | |
571 scoped_ptr<password_manager::PasswordFormManager> test_form_manager( | |
572 CreateFormManager()); | |
573 test_form_manager->ProvisionallySave( | |
574 test_local_form(), | |
575 password_manager::PasswordFormManager::IGNORE_OTHER_POSSIBLE_USERNAMES); | |
576 controller()->OnUpdatePasswordSubmitted(test_form_manager.Pass()); | |
577 | |
578 ManagePasswordsIconMock mock; | |
579 controller()->UpdateIconAndBubbleState(&mock); | |
vasilii
2015/07/31 14:38:53
You need to check the mock state here or just remo
dvadym
2015/08/03 15:44:08
Done.
| |
580 controller()->UpdatePassword(autofill::PasswordForm()); | |
581 controller()->UpdateIconAndBubbleState(&mock); | |
582 EXPECT_EQ(password_manager::ui::MANAGE_STATE, mock.state()); | |
583 } | |
OLD | NEW |