| 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 c4cedb3db0955ccc31bea8631feb12ecffd19939..1239e8dcf4816ab4cb96fd82c6d5a5e3bf698307 100644
|
| --- a/chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc
|
| +++ b/chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc
|
| @@ -225,6 +225,7 @@ void NativeBackendKWalletTestBase::CheckPasswordForm(
|
| EXPECT_EQ(expected.avatar_url, actual.avatar_url);
|
| EXPECT_EQ(expected.federation_url, actual.federation_url);
|
| EXPECT_EQ(expected.skip_zero_click, actual.skip_zero_click);
|
| + EXPECT_EQ(expected.generation_upload_status, actual.generation_upload_status);
|
| }
|
|
|
| // static
|
| @@ -965,6 +966,7 @@ TEST_F(NativeBackendKWalletTest, RemoveLoginsSyncedBetween) {
|
|
|
| class NativeBackendKWalletPickleTest : public NativeBackendKWalletTestBase {
|
| protected:
|
| + void CreateVersion6Pickle(const PasswordForm& form, Pickle* pickle);
|
| void CreateVersion5Pickle(const PasswordForm& form, Pickle* pickle);
|
| void CreateVersion3Pickle(const PasswordForm& form, Pickle* pickle);
|
| void CreateVersion2Pickle(const PasswordForm& form, Pickle* pickle);
|
| @@ -972,6 +974,7 @@ class NativeBackendKWalletPickleTest : public NativeBackendKWalletTestBase {
|
| void CreateVersion0Pickle(bool size_32,
|
| const PasswordForm& form,
|
| Pickle* pickle);
|
| + void CheckVersion6Pickle();
|
| void CheckVersion5Pickle();
|
| void CheckVersion3Pickle();
|
| void CheckVersion2Pickle();
|
| @@ -989,6 +992,22 @@ class NativeBackendKWalletPickleTest : public NativeBackendKWalletTestBase {
|
| Pickle* pickle);
|
| };
|
|
|
| +void NativeBackendKWalletPickleTest::CreateVersion6Pickle(
|
| + const PasswordForm& form,
|
| + Pickle* pickle) {
|
| + pickle->WriteInt(6);
|
| + CreatePickle(false, true, form, pickle);
|
| + pickle->WriteInt(form.type);
|
| + pickle->WriteInt(form.times_used);
|
| + autofill::SerializeFormData(form.form_data, pickle);
|
| + pickle->WriteInt64(form.date_synced.ToInternalValue());
|
| + pickle->WriteString16(form.display_name);
|
| + pickle->WriteString(form.avatar_url.spec());
|
| + pickle->WriteString(form.federation_url.spec());
|
| + pickle->WriteBool(form.skip_zero_click);
|
| + pickle->WriteInt(form.generation_upload_status);
|
| +}
|
| +
|
| void NativeBackendKWalletPickleTest::CreateVersion5Pickle(
|
| const PasswordForm& form,
|
| Pickle* pickle) {
|
| @@ -1060,6 +1079,22 @@ void NativeBackendKWalletPickleTest::CreatePickle(bool size_32,
|
| pickle->WriteInt64(form.date_created.ToTimeT());
|
| }
|
|
|
| +void NativeBackendKWalletPickleTest::CheckVersion6Pickle() {
|
| + Pickle pickle;
|
| + PasswordForm form = form_google_;
|
| + form.generation_upload_status = PasswordForm::NEGATIVE_SIGNAL_SENT;
|
| + CreateVersion6Pickle(form, &pickle);
|
| +
|
| + ScopedVector<PasswordForm> form_list;
|
| + NativeBackendKWalletStub::DeserializeValue(form.signon_realm, pickle,
|
| + &form_list);
|
| +
|
| + EXPECT_EQ(1u, form_list.size());
|
| + if (form_list.size() > 0)
|
| + CheckPasswordForm(form, *form_list[0], true);
|
| +
|
| +}
|
| +
|
| void NativeBackendKWalletPickleTest::CheckVersion5Pickle() {
|
| Pickle pickle;
|
| PasswordForm form = form_google_;
|
| @@ -1202,3 +1237,7 @@ TEST_F(NativeBackendKWalletPickleTest, CheckVersion3Pickle) {
|
| TEST_F(NativeBackendKWalletPickleTest, CheckVersion5Pickle) {
|
| CheckVersion5Pickle();
|
| }
|
| +
|
| +TEST_F(NativeBackendKWalletPickleTest, CheckVersion6Pickle) {
|
| + CheckVersion6Pickle();
|
| +}
|
|
|