PasswordStore: Clean up expectations about rewriting vectors of forms

chrome/browser/password_manager/native_backend_libsecret_unittest.cc

 // Copyright (c) 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stdarg.h>
 
 #include "base/basictypes.h"
 #include "base/prefs/pref_service.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 133 matching lines @@
       VLOG(1) << "Adding item attribute " << name << ", value '" << value
               << "'";
     } else {
       uint32_t intvalue = va_arg(ap, uint32_t);
       VLOG(1) << "Adding item attribute " << name << ", value " << intvalue;
       value = g_strdup_printf("%u", intvalue);
     }
     g_hash_table_insert(attributes, g_strdup(name), value);
   }
   va_end(ap);
-  for (uint32_t i = 0; i < global_mock_libsecret_items->size();)
-    if (Matches((*global_mock_libsecret_items)[i], attributes)) {
-      global_mock_libsecret_items->erase(global_mock_libsecret_items->begin() +
-                                         i);
-    } else {
-      ++i;
+
+  ScopedVector<MockSecretItem> kept_mock_libsecret_items;
+  kept_mock_libsecret_items.reserve(global_mock_libsecret_items->size());
+  for (auto& item : *global_mock_libsecret_items) {
+    if (!Matches(item, attributes)) {
+      kept_mock_libsecret_items.push_back(item);
+      item = nullptr;
     }
+  }
+  global_mock_libsecret_items->swap(kept_mock_libsecret_items);
+
   g_hash_table_unref(attributes);
   return true;
 }
 
 MockSecretValue* mock_secret_item_get_secret(MockSecretItem* self) {
   return self->value;
 }
 
 const gchar* mock_secret_value_get_text(MockSecretValue* value) {
   return value->password;
@@ skipping 618 matching lines @@
 
   actual_changes = backend.AddLogin(form_google_);
   CheckPasswordChanges(expected_changes, actual_changes);
 
   EXPECT_EQ(1u, global_mock_libsecret_items->size());
   if (!global_mock_libsecret_items->empty())
     CheckMockSecretItem((*global_mock_libsecret_items)[0], form_google_,
                         "chrome-42");
 }
 
-TEST_F(NativeBackendLibsecretTest, ListLoginsAppends) {
-  NativeBackendLibsecret backend(42);
-
-  backend.AddLogin(form_google_);
-
-  // Send the same request twice with the same list both times.
-  ScopedVector<autofill::PasswordForm> form_list;
-  backend.GetAutofillableLogins(&form_list);
-  backend.GetAutofillableLogins(&form_list);
-
-  // Quick check that we got two results back.
-  EXPECT_EQ(2u, form_list.size());
-  form_list.clear();
-
-  EXPECT_EQ(1u, global_mock_libsecret_items->size());
-  if (!global_mock_libsecret_items->empty())
-    CheckMockSecretItem((*global_mock_libsecret_items)[0], form_google_,
-                        "chrome-42");
-}
-
 TEST_F(NativeBackendLibsecretTest, AndroidCredentials) {
   NativeBackendLibsecret backend(42);
   backend.Init();
 
   PasswordForm observed_android_form;
   observed_android_form.scheme = PasswordForm::SCHEME_HTML;
   observed_android_form.signon_realm =
       "android://7x7IDboo8u9YKraUsbmVkuf1-@net.rateflix.app/";
   PasswordForm saved_android_form = observed_android_form;
   saved_android_form.username_value = base::UTF8ToUTF16("randomusername");
   saved_android_form.password_value = base::UTF8ToUTF16("password");
   saved_android_form.date_created = base::Time::Now();
 
   backend.AddLogin(saved_android_form);
 
   ScopedVector<autofill::PasswordForm> form_list;
   backend.GetAutofillableLogins(&form_list);
 
   EXPECT_EQ(1u, form_list.size());
   EXPECT_EQ(saved_android_form, *form_list[0]);
 }
 
-
 TEST_F(NativeBackendLibsecretTest, RemoveLoginsCreatedBetween) {
   CheckRemoveLoginsBetween(CREATED);
 }
 
 TEST_F(NativeBackendLibsecretTest, RemoveLoginsSyncedBetween) {
   CheckRemoveLoginsBetween(SYNCED);
 }
 
 TEST_F(NativeBackendLibsecretTest, SomeKeyringAttributesAreMissing) {
   // Absent attributes should be filled with default values.
   NativeBackendLibsecret backend(42);
 
   backend.AddLogin(form_google_);
 
   EXPECT_EQ(1u, global_mock_libsecret_items->size());
   // Remove a string attribute.
   (*global_mock_libsecret_items)[0]->RemoveAttribute("avatar_url");
   // Remove an integer attribute.
   (*global_mock_libsecret_items)[0]->RemoveAttribute("ssl_valid");
 
   ScopedVector<autofill::PasswordForm> form_list;
   backend.GetAutofillableLogins(&form_list);
 
   EXPECT_EQ(1u, form_list.size());
   EXPECT_EQ(GURL(""), form_list[0]->avatar_url);
   EXPECT_FALSE(form_list[0]->ssl_valid);
 }
 
 // TODO(mdm): add more basic tests here at some point.