| 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 edfbdc0589f82a6aa550bd89879ccb274bfa4868..ed52cb6796df25377cb3e5e2ca1b94ffd991c58f 100644
|
| --- a/chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc
|
| +++ b/chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc
|
| @@ -605,8 +605,8 @@ void NativeBackendKWalletTest::CheckPasswordForms(
|
| TestKWallet::Blob value;
|
| EXPECT_TRUE(wallet_.readEntry(folder, entries[i], &value));
|
| Pickle pickle(reinterpret_cast<const char*>(value.data()), value.size());
|
| - ScopedVector<autofill::PasswordForm> forms;
|
| - NativeBackendKWalletStub::DeserializeValue(entries[i], pickle, &forms);
|
| + ScopedVector<autofill::PasswordForm> forms =
|
| + NativeBackendKWalletStub::DeserializeValue(entries[i], pickle);
|
| const std::vector<const PasswordForm*>& expect = sorted_expected[i].second;
|
| EXPECT_EQ(expect.size(), forms.size());
|
| for (size_t j = 0; j < forms.size() && j < expect.size(); ++j)
|
| @@ -1029,9 +1029,8 @@ void NativeBackendKWalletPickleTest::CheckVersion5Pickle() {
|
| PasswordForm form = form_google_;
|
| CreateVersion5Pickle(form, &pickle);
|
|
|
| - ScopedVector<PasswordForm> form_list;
|
| - NativeBackendKWalletStub::DeserializeValue(form.signon_realm, pickle,
|
| - &form_list);
|
| + ScopedVector<PasswordForm> form_list =
|
| + NativeBackendKWalletStub::DeserializeValue(form.signon_realm, pickle);
|
|
|
| EXPECT_EQ(1u, form_list.size());
|
| if (form_list.size() > 0)
|
| @@ -1048,9 +1047,8 @@ void NativeBackendKWalletPickleTest::CheckVersion3Pickle() {
|
| form.skip_zero_click = false;
|
| CreateVersion3Pickle(form, &pickle);
|
|
|
| - ScopedVector<PasswordForm> form_list;
|
| - NativeBackendKWalletStub::DeserializeValue(form.signon_realm, pickle,
|
| - &form_list);
|
| + ScopedVector<PasswordForm> form_list =
|
| + NativeBackendKWalletStub::DeserializeValue(form.signon_realm, pickle);
|
|
|
| EXPECT_EQ(1u, form_list.size());
|
| if (form_list.size() > 0)
|
| @@ -1065,9 +1063,8 @@ void NativeBackendKWalletPickleTest::CheckVersion2Pickle() {
|
| form.form_data = form_google_.form_data;
|
| CreateVersion2Pickle(form, &pickle);
|
|
|
| - ScopedVector<PasswordForm> form_list;
|
| - NativeBackendKWalletStub::DeserializeValue(form.signon_realm, pickle,
|
| - &form_list);
|
| + ScopedVector<PasswordForm> form_list =
|
| + NativeBackendKWalletStub::DeserializeValue(form.signon_realm, pickle);
|
|
|
| EXPECT_EQ(1u, form_list.size());
|
| if (form_list.size() > 0)
|
| @@ -1080,9 +1077,8 @@ void NativeBackendKWalletPickleTest::CheckVersion1Pickle() {
|
| PasswordForm form = form_google_;
|
| CreateVersion1Pickle(form, &pickle);
|
|
|
| - ScopedVector<autofill::PasswordForm> form_list;
|
| - NativeBackendKWalletStub::DeserializeValue(form.signon_realm,
|
| - pickle, &form_list);
|
| + ScopedVector<autofill::PasswordForm> form_list =
|
| + NativeBackendKWalletStub::DeserializeValue(form.signon_realm, pickle);
|
|
|
| // This will match |old_form_google_| because not all the fields present in
|
| // |form_google_| will be deserialized.
|
| @@ -1097,9 +1093,8 @@ void NativeBackendKWalletPickleTest::CheckVersion0Pickle(
|
| PasswordForm form = old_form_google_;
|
| form.scheme = scheme;
|
| CreateVersion0Pickle(size_32, form, &pickle);
|
| - ScopedVector<autofill::PasswordForm> form_list;
|
| - NativeBackendKWalletStub::DeserializeValue(form.signon_realm,
|
| - pickle, &form_list);
|
| + ScopedVector<autofill::PasswordForm> form_list =
|
| + NativeBackendKWalletStub::DeserializeValue(form.signon_realm, pickle);
|
| EXPECT_EQ(1u, form_list.size());
|
| if (form_list.size() > 0)
|
| CheckPasswordForm(form, *form_list[0], false);
|
|
|