| 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 531 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 542 EXPECT_EQ(password_manager::ui::MANAGE_STATE, controller()->state()); | 542 EXPECT_EQ(password_manager::ui::MANAGE_STATE, controller()->state()); |
| 543 controller()->UpdateIconAndBubbleState(&mock); | 543 controller()->UpdateIconAndBubbleState(&mock); |
| 544 EXPECT_EQ(password_manager::ui::MANAGE_STATE, mock.state()); | 544 EXPECT_EQ(password_manager::ui::MANAGE_STATE, mock.state()); |
| 545 } | 545 } |
| 546 | 546 |
| 547 TEST_F(ManagePasswordsUIControllerTest, InactiveOnPSLMatched) { | 547 TEST_F(ManagePasswordsUIControllerTest, InactiveOnPSLMatched) { |
| 548 base::string16 kTestUsername = base::ASCIIToUTF16("test_username"); | 548 base::string16 kTestUsername = base::ASCIIToUTF16("test_username"); |
| 549 autofill::PasswordFormMap map; | 549 autofill::PasswordFormMap map; |
| 550 scoped_ptr<autofill::PasswordForm> psl_matched_test_form( | 550 scoped_ptr<autofill::PasswordForm> psl_matched_test_form( |
| 551 new autofill::PasswordForm(test_local_form())); | 551 new autofill::PasswordForm(test_local_form())); |
| 552 psl_matched_test_form->original_signon_realm = | 552 psl_matched_test_form->is_public_suffix_match = true; |
| 553 "http://pslmatched.example.com"; | |
| 554 map.insert(kTestUsername, psl_matched_test_form.Pass()); | 553 map.insert(kTestUsername, psl_matched_test_form.Pass()); |
| 555 controller()->OnPasswordAutofilled(map); | 554 controller()->OnPasswordAutofilled(map); |
| 556 | 555 |
| 557 EXPECT_EQ(password_manager::ui::INACTIVE_STATE, controller()->state()); | 556 EXPECT_EQ(password_manager::ui::INACTIVE_STATE, controller()->state()); |
| 558 } | 557 } |
| 559 | 558 |
| 560 TEST_F(ManagePasswordsUIControllerTest, UpdatePasswordSubmitted) { | 559 TEST_F(ManagePasswordsUIControllerTest, UpdatePasswordSubmitted) { |
| 561 scoped_ptr<password_manager::PasswordFormManager> test_form_manager( | 560 scoped_ptr<password_manager::PasswordFormManager> test_form_manager( |
| 562 CreateFormManager()); | 561 CreateFormManager()); |
| 563 controller()->OnUpdatePasswordSubmitted(test_form_manager.Pass()); | 562 controller()->OnUpdatePasswordSubmitted(test_form_manager.Pass()); |
| (...skipping 13 matching lines...) Expand all Loading... |
| 577 password_manager::PasswordFormManager::IGNORE_OTHER_POSSIBLE_USERNAMES); | 576 password_manager::PasswordFormManager::IGNORE_OTHER_POSSIBLE_USERNAMES); |
| 578 controller()->OnUpdatePasswordSubmitted(test_form_manager.Pass()); | 577 controller()->OnUpdatePasswordSubmitted(test_form_manager.Pass()); |
| 579 | 578 |
| 580 ManagePasswordsIconMock mock; | 579 ManagePasswordsIconMock mock; |
| 581 controller()->UpdateIconAndBubbleState(&mock); | 580 controller()->UpdateIconAndBubbleState(&mock); |
| 582 EXPECT_EQ(password_manager::ui::PENDING_PASSWORD_UPDATE_STATE, mock.state()); | 581 EXPECT_EQ(password_manager::ui::PENDING_PASSWORD_UPDATE_STATE, mock.state()); |
| 583 controller()->UpdatePassword(autofill::PasswordForm()); | 582 controller()->UpdatePassword(autofill::PasswordForm()); |
| 584 controller()->UpdateIconAndBubbleState(&mock); | 583 controller()->UpdateIconAndBubbleState(&mock); |
| 585 EXPECT_EQ(password_manager::ui::MANAGE_STATE, mock.state()); | 584 EXPECT_EQ(password_manager::ui::MANAGE_STATE, mock.state()); |
| 586 } | 585 } |
| OLD | NEW |