components/autofill/core/common/password_form.cc - Issue 1723583004: CREDENTIAL: Convert federations from URLs to origins throughout.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: components/autofill/core/common/password_form.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/autofill/core/common/password_form.h ('k') | components/password_manager/content/browser/credential_manager_dispatcher_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/autofill/core/common/password_form.cc

diff --git a/components/autofill/core/common/password_form.cc b/components/autofill/core/common/password_form.cc

index 5f8cbbf0eda6816ee9c2d8340c94252d84477393..df6cfe96c8bd49fa79d5b913cea6395700abdeec 100644

--- a/components/autofill/core/common/password_form.cc

+++ b/components/autofill/core/common/password_form.cc

@@ -56,8 +56,7 @@ void PasswordFormToJSON(const PasswordForm& form,

target->SetInteger("generation_upload_status", form.generation_upload_status);

target->SetString("display_name", form.display_name);

target->SetString("icon_url", form.icon_url.possibly_invalid_spec());

- target->SetString("federation_url",

- form.federation_url.possibly_invalid_spec());

+ target->SetString("federation_origin", form.federation_origin.Serialize());

target->SetBoolean("skip_next_zero_click", form.skip_zero_click);

std::ostringstream layout_string_stream;

layout_string_stream << form.layout;

@@ -118,7 +117,9 @@ bool PasswordForm::operator==(const PasswordForm& form) const {

form_data.SameFormAs(form.form_data) &&

generation_upload_status == form.generation_upload_status &&

display_name == form.display_name && icon_url == form.icon_url &&

- federation_url == form.federation_url &&

+ // We compare the serialization of the origins here, as we want unique

+ // origins to compare as '=='.

+ federation_origin.Serialize() == form.federation_origin.Serialize() &&

skip_zero_click == form.skip_zero_click && layout == form.layout &&

was_parsed_using_autofill_predictions ==

form.was_parsed_using_autofill_predictions &&