Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4552)

Unified Diff: chrome/browser/password_manager/native_backend_kwallet_x_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
Index: chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc
diff --git a/chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc b/chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc
index 9b166e42ce1b57ef7ddf4baba58a4f383a8b1755..212918e042c378607e538babe021b6af57d9510d 100644
--- a/chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc
+++ b/chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc
@@ -184,7 +184,8 @@ class NativeBackendKWalletTestBase :
form_google_.date_created = old_form_google_.date_created;
form_google_.display_name = UTF8ToUTF16("Joe Schmoe");
form_google_.icon_url = GURL("http://www.google.com/icon");
- form_google_.federation_url = GURL("http://www.google.com/federation_url");
+ form_google_.federation_origin =
+ url::Origin(GURL("http://www.google.com/"));
form_google_.skip_zero_click = true;
form_google_.generation_upload_status = PasswordForm::NEGATIVE_SIGNAL_SENT;
@@ -240,7 +241,8 @@ void NativeBackendKWalletTestBase::CheckPasswordForm(
EXPECT_EQ(expected.date_synced, actual.date_synced);
EXPECT_EQ(expected.display_name, actual.display_name);
EXPECT_EQ(expected.icon_url, actual.icon_url);
- EXPECT_EQ(expected.federation_url, actual.federation_url);
+ EXPECT_EQ(expected.federation_origin.Serialize(),
+ actual.federation_origin.Serialize());
EXPECT_EQ(expected.skip_zero_click, actual.skip_zero_click);
EXPECT_EQ(expected.generation_upload_status, actual.generation_upload_status);
}
@@ -1146,7 +1148,7 @@ void NativeBackendKWalletPickleTest::CreateVersion1PlusPickle(
return;
pickle->WriteString16(form.display_name);
pickle->WriteString(form.icon_url.spec());
- pickle->WriteString(form.federation_url.spec());
+ pickle->WriteString(form.federation_origin.Serialize());
pickle->WriteBool(form.skip_zero_click);
if (effective_version < 7)
return;
@@ -1227,7 +1229,7 @@ void NativeBackendKWalletPickleTest::CheckVersion3Pickle() {
// Remove the fields which were not present in version #3.
form.display_name = default_values.display_name;
form.icon_url = default_values.icon_url;
- form.federation_url = default_values.federation_url;
+ form.federation_origin = default_values.federation_origin;
form.skip_zero_click = default_values.skip_zero_click;
form.generation_upload_status = default_values.generation_upload_status;
CreateVersion1PlusPickle(form, &pickle, 3, 3);

Powered by Google App Engine
This is Rietveld 408576698