chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc - Issue 928753003: Clean password_manager::ui::State

Unified Diff: chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc

Issue 928753003: Clean password_manager::ui::State (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: clear more Created 5 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/ui/passwords/manage_passwords_bubble_model.cc ('K') | « chrome/browser/ui/passwords/manage_passwords_ui_controller.cc ('k') | chrome/browser/ui/views/passwords/manage_password_items_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc

diff --git a/chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc b/chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc

index 52a271737ce73d0e98b4e0034064ce273561b70d..2029c9a2c122b4891d42f2aecdb8a56614a2f0f0 100644

--- a/chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc

+++ b/chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc

@@ -109,7 +109,7 @@ TEST_F(ManagePasswordsUIControllerTest, PasswordSubmitted) {

new password_manager::PasswordFormManager(

NULL, &client, driver.AsWeakPtr(), test_form(), false));

controller()->OnPasswordSubmitted(test_form_manager.Pass());

- EXPECT_EQ(password_manager::ui::PENDING_PASSWORD_AND_BUBBLE_STATE,

+ EXPECT_EQ(password_manager::ui::PENDING_PASSWORD_STATE,

controller()->state());

EXPECT_TRUE(controller()->PasswordPendingUserDecision());

@@ -331,7 +331,7 @@ TEST_F(ManagePasswordsUIControllerTest, ChooseCredentialLocal) {

local_credentials.Pass(), federated_credentials.Pass(), origin,

base::Bind(&ManagePasswordsUIControllerTest::CredentialCallback,

base::Unretained(this))));

- EXPECT_EQ(password_manager::ui::CREDENTIAL_REQUEST_AND_BUBBLE_STATE,

+ EXPECT_EQ(password_manager::ui::CREDENTIAL_REQUEST_STATE,

controller()->state());

EXPECT_FALSE(controller()->PasswordPendingUserDecision());

EXPECT_EQ(origin, controller()->origin());

@@ -361,7 +361,7 @@ TEST_F(ManagePasswordsUIControllerTest, ChooseCredentialFederated) {

local_credentials.Pass(), federated_credentials.Pass(), origin,

base::Bind(&ManagePasswordsUIControllerTest::CredentialCallback,

base::Unretained(this))));

- EXPECT_EQ(password_manager::ui::CREDENTIAL_REQUEST_AND_BUBBLE_STATE,

+ EXPECT_EQ(password_manager::ui::CREDENTIAL_REQUEST_STATE,

controller()->state());

EXPECT_FALSE(controller()->PasswordPendingUserDecision());

EXPECT_EQ(autofill::ConstPasswordFormMap(), controller()->best_matches());

@@ -390,7 +390,7 @@ TEST_F(ManagePasswordsUIControllerTest, ChooseCredentialCancel) {

local_credentials.Pass(), federated_credentials.Pass(), origin,

base::Bind(&ManagePasswordsUIControllerTest::CredentialCallback,

base::Unretained(this))));

- EXPECT_EQ(password_manager::ui::CREDENTIAL_REQUEST_AND_BUBBLE_STATE,

+ EXPECT_EQ(password_manager::ui::CREDENTIAL_REQUEST_STATE,

controller()->state());

EXPECT_EQ(origin, controller()->origin());

controller()->ManagePasswordsUIController::ChooseCredential(