Chromium Code Reviews| 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..c0790bbae1615216622642f074f65a4007dac7ae 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,8 @@ 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/federation")); |
|
vasilii
2016/02/23 14:59:20
Here and below should be fixed.
Mike West
2016/02/25 09:56:16
Dropped the '/federation' (which I think is what y
|
| form->skip_zero_click = true; |
| } |
| @@ -633,7 +635,8 @@ 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/federation")); |
| form.skip_zero_click = true; |
| if (date_is_creation) |
| @@ -757,7 +760,8 @@ 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/federation")); |
| form.skip_zero_click = true; |
| EXPECT_EQ(AddChangeForForm(form), db().AddLogin(form)); |
| @@ -981,7 +985,8 @@ 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/federation")); |
| form.skip_zero_click = true; |
| EXPECT_EQ(UpdateChangeForForm(form), db().UpdateLogin(form)); |