components/password_manager/core/browser/password_syncable_service.cc - Issue 1778423002: Don't upload "null" to the Sync server for empty federation_url.

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/password_manager/core/browser/password_syncable_service.cc

Issue 1778423002: Don't upload "null" to the Sync server for empty federation_url. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2661

Patch Set: Created 4 years, 9 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

« no previous file with comments | « components/password_manager/core/browser/login_database.cc ('k') | components/password_manager/core/browser/password_syncable_service_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index aba613b409b4522011903d4e18dea0256a6fad1a..9d82deab010f87b1b6d83b4525532d3c502e77e2 100644

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

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

@@ -61,8 +61,8 @@ bool AreLocalAndSyncPasswordsEqual(

base::UTF16ToUTF8(password_form.display_name) ==

password_specifics.display_name() &&

password_form.icon_url.spec() == password_specifics.avatar_url() &&

- password_form.federation_origin.Serialize() ==

- password_specifics.federation_url());

+ url::Origin(GURL(password_specifics.federation_url())).Serialize() ==

+ password_form.federation_origin.Serialize());

}

syncer::SyncChange::SyncChangeType GetSyncChangeType(

@@ -464,7 +464,9 @@ syncer::SyncData SyncDataFromPassword(

CopyStringField(display_name);

password_specifics->set_avatar_url(password_form.icon_url.spec());

password_specifics->set_federation_url(

- password_form.federation_origin.Serialize());

+ password_form.federation_origin.unique()

+ ? std::string()

+ : password_form.federation_origin.Serialize());

#undef CopyStringField

#undef CopyField