components/password_manager/core/browser/login_database_unittest.cc - Issue 1723583004: CREDENTIAL: Convert federations from URLs to origins throughout.

Unified Diff: components/password_manager/core/browser/login_database_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') | « components/password_manager/core/browser/login_database.cc ('k') | components/password_manager/core/browser/password_manager_test_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/password_manager/core/browser/login_database_unittest.cc

diff --git a/components/password_manager/core/browser/login_database_unittest.cc b/components/password_manager/core/browser/login_database_unittest.cc

index abd0adac7490e74caf0c7c885233bfe0d2943be1..6c21f78911f5825895b0bb87c3a35bc752fdd4e5 100644

--- a/components/password_manager/core/browser/login_database_unittest.cc

+++ b/components/password_manager/core/browser/login_database_unittest.cc

@@ -25,6 +25,7 @@

#include "sql/test/test_helpers.h"

#include "testing/gmock/include/gmock/gmock.h"

#include "testing/gtest/include/gtest/gtest.h"

+#include "url/origin.h"

#if defined(OS_MACOSX)

#include "components/os_crypt/os_crypt.h"

@@ -63,7 +64,7 @@ void GenerateExamplePasswordForm(PasswordForm* form) {

form->date_synced = base::Time::Now();

form->display_name = ASCIIToUTF16("Mr. Smith");

form->icon_url = GURL("https://accounts.google.com/Icon");

- form->federation_url = GURL("https://accounts.google.com/federation");

+ form->federation_origin = url::Origin(GURL("https://accounts.google.com/"));

form->skip_zero_click = true;

}

@@ -633,7 +634,7 @@ static bool AddTimestampedLogin(LoginDatabase* db,

form.signon_realm = url;

form.display_name = ASCIIToUTF16(unique_string);

form.icon_url = GURL("https://accounts.google.com/Icon");

- form.federation_url = GURL("https://accounts.google.com/federation");

+ form.federation_origin = url::Origin(GURL("https://accounts.google.com/"));

form.skip_zero_click = true;

if (date_is_creation)

@@ -757,7 +758,7 @@ TEST_F(LoginDatabaseTest, BlacklistedLogins) {

form.date_synced = base::Time::Now();

form.display_name = ASCIIToUTF16("Mr. Smith");

form.icon_url = GURL("https://accounts.google.com/Icon");

- form.federation_url = GURL("https://accounts.google.com/federation");

+ form.federation_origin = url::Origin(GURL("https://accounts.google.com/"));

form.skip_zero_click = true;

EXPECT_EQ(AddChangeForForm(form), db().AddLogin(form));

@@ -981,7 +982,7 @@ TEST_F(LoginDatabaseTest, UpdateLogin) {

form.type = PasswordForm::TYPE_GENERATED;

form.display_name = ASCIIToUTF16("Mr. Smith");

form.icon_url = GURL("https://accounts.google.com/Icon");

- form.federation_url = GURL("https://accounts.google.com/federation");

+ form.federation_origin = url::Origin(GURL("https://accounts.google.com/"));

form.skip_zero_click = true;

EXPECT_EQ(UpdateChangeForForm(form), db().UpdateLogin(form));