| Index: chrome/browser/password_manager/native_backend_gnome_x_unittest.cc
|
| diff --git a/chrome/browser/password_manager/native_backend_gnome_x_unittest.cc b/chrome/browser/password_manager/native_backend_gnome_x_unittest.cc
|
| index 93d79a55cd38097e5d274f2cc130e88fa48b9265..f94dc953700e53552bde562be9f2564ccf4dbf71 100644
|
| --- a/chrome/browser/password_manager/native_backend_gnome_x_unittest.cc
|
| +++ b/chrome/browser/password_manager/native_backend_gnome_x_unittest.cc
|
| @@ -317,7 +317,8 @@ void CheckPasswordChanges(const PasswordStoreChangeList& expected_list,
|
| 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);
|
| @@ -371,7 +372,8 @@ class NativeBackendGnomeTest : public testing::Test {
|
| form_google_.date_synced = base::Time::Now();
|
| 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::POSITIVE_SIGNAL_SENT;
|
| form_google_.form_data.name = UTF8ToUTF16("form_name");
|
| @@ -388,7 +390,8 @@ class NativeBackendGnomeTest : public testing::Test {
|
| form_facebook_.date_synced = base::Time::Now();
|
| form_facebook_.display_name = UTF8ToUTF16("Joe Schmoe");
|
| form_facebook_.icon_url = GURL("http://www.facebook.com/icon");
|
| - form_facebook_.federation_url = GURL("http://www.facebook.com/federation");
|
| + form_facebook_.federation_origin =
|
| + url::Origin(GURL("http://www.facebook.com/"));
|
| form_facebook_.skip_zero_click = true;
|
| form_facebook_.generation_upload_status = PasswordForm::NO_SIGNAL_SENT;
|
|
|
| @@ -488,7 +491,8 @@ class NativeBackendGnomeTest : public testing::Test {
|
| form.date_synced.ToInternalValue()));
|
| CheckStringAttribute(item, "display_name", UTF16ToUTF8(form.display_name));
|
| CheckStringAttribute(item, "avatar_url", form.icon_url.spec());
|
| - CheckStringAttribute(item, "federation_url", form.federation_url.spec());
|
| + CheckStringAttribute(item, "federation_url",
|
| + form.federation_origin.Serialize());
|
| CheckUint32Attribute(item, "skip_zero_click", form.skip_zero_click);
|
| CheckUint32Attribute(item, "generation_upload_status",
|
| form.generation_upload_status);
|
|
|