chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc - Issue 1723583004: CREDENTIAL: Convert federations from URLs to origins throughout.

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

Issue 1723583004: CREDENTIAL: Convert federations from URLs to origins throughout. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: iOS2 Created 4 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/password_manager/save_password_infobar_delegate.cc ('K') | « chrome/browser/ui/passwords/manage_passwords_state_unittest.cc ('k') | chrome/browser/ui/passwords/manage_passwords_view_utils.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 66566a904aadfc8c6870527a70e470acb4ca08c0..bd75b397eaa437d05d3b03948fc02fd04caa273d 100644

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

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

@@ -206,7 +206,8 @@ void ManagePasswordsUIControllerTest::SetUp() {

test_federated_form_.origin = GURL("http://example.com/login");

test_federated_form_.username_value = base::ASCIIToUTF16("username");

- test_federated_form_.federation_url = GURL("https://federation.test/");

+ test_federated_form_.federation_origin =

+ url::Origin(GURL("https://federation.test/"));

// We need to be on a "webby" URL for most tests.

content::WebContentsTester::For(web_contents())

@@ -495,7 +496,7 @@ TEST_F(ManagePasswordsUIControllerTest, ChooseCredentialLocal) {

ASSERT_TRUE(credential_info());

EXPECT_EQ(test_local_form().username_value, credential_info()->id);

EXPECT_EQ(test_local_form().password_value, credential_info()->password);

- EXPECT_TRUE(credential_info()->federation.is_empty());

+ EXPECT_TRUE(credential_info()->federation.unique());

EXPECT_EQ(password_manager::CredentialType::CREDENTIAL_TYPE_PASSWORD,

credential_info()->type);

}

@@ -531,7 +532,7 @@ TEST_F(ManagePasswordsUIControllerTest, ChooseCredentialLocalButFederated) {

EXPECT_EQ(password_manager::ui::MANAGE_STATE, controller()->GetState());

ASSERT_TRUE(credential_info());

EXPECT_EQ(test_federated_form().username_value, credential_info()->id);

- EXPECT_EQ(test_federated_form().federation_url,

+ EXPECT_EQ(test_federated_form().federation_origin,

credential_info()->federation);

EXPECT_TRUE(credential_info()->password.empty());

EXPECT_EQ(password_manager::CredentialType::CREDENTIAL_TYPE_FEDERATED,

@@ -595,7 +596,7 @@ TEST_F(ManagePasswordsUIControllerTest, ChooseCredentialCancel) {

dialog_controller->OnCloseDialog();

EXPECT_EQ(password_manager::ui::MANAGE_STATE, controller()->GetState());

ASSERT_TRUE(credential_info());

- EXPECT_TRUE(credential_info()->federation.is_empty());

+ EXPECT_TRUE(credential_info()->federation.unique());

EXPECT_TRUE(credential_info()->password.empty());

EXPECT_EQ(password_manager::CredentialType::CREDENTIAL_TYPE_EMPTY,

credential_info()->type);