PasswordStore: Use ScopedVector to express ownership 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 392 matching lines @@
     PasswordForm target_form;
     target_form.origin = url;
     target_form.signon_realm = url.spec();
     if (scheme != PasswordForm::SCHEME_HTML) {
       // For non-HTML forms, the realm used for authentication
       // (http://tools.ietf.org/html/rfc1945#section-10.2) is appended to the
       // signon_realm. Just use a default value for now.
       target_form.signon_realm.append("Realm");
       target_form.scheme = scheme;
     }
-    std::vector<PasswordForm*> form_list;
+    ScopedVector<autofill::PasswordForm> form_list;
     backend.GetLogins(target_form, &form_list);
 
     EXPECT_EQ(1u, global_mock_libsecret_items.size());
     if (global_mock_libsecret_items.size() > 0)
       CheckMockSecretItem(global_mock_libsecret_items[0], credentials,
                           "chrome-321");
     ClearMockObjects();
 
     if (form_list.empty())
       return false;
     EXPECT_EQ(1u, form_list.size());
     if (result)
       *result = *form_list[0];
-    STLDeleteElements(&form_list);
     return true;
   }
 
   // Test that updating does not use PSL matching: Add a www.facebook.com
   // password, then use PSL matching to get a copy of it for m.facebook.com, and
   // add that copy as well. Now update the www.facebook.com password -- the
   // m.facebook.com password should not get updated. Depending on the argument,
   // the credential update is done via UpdateLogin or AddLogin.
   void CheckPSLUpdate(UpdateType update_type) {
     NativeBackendLibsecret backend(321);
 
     backend.AddLogin(form_facebook_);
 
     // Get the PSL-matched copy of the saved login for m.facebook.
     const GURL kMobileURL("http://m.facebook.com/");
     PasswordForm m_facebook_lookup;
     m_facebook_lookup.origin = kMobileURL;
     m_facebook_lookup.signon_realm = kMobileURL.spec();
-    std::vector<PasswordForm*> form_list;
+    ScopedVector<autofill::PasswordForm> form_list;
     backend.GetLogins(m_facebook_lookup, &form_list);
 
     EXPECT_EQ(1u, global_mock_libsecret_items.size());
     EXPECT_EQ(1u, form_list.size());
     PasswordForm m_facebook = *form_list[0];
-    STLDeleteElements(&form_list);
+    form_list.clear();
     EXPECT_EQ(kMobileURL, m_facebook.origin);
     EXPECT_EQ(kMobileURL.spec(), m_facebook.signon_realm);
 
     // Add the PSL-matched copy to saved logins.
     backend.AddLogin(m_facebook);
     EXPECT_EQ(2u, global_mock_libsecret_items.size());
 
     // Update www.facebook.com login.
     PasswordForm new_facebook(form_facebook_);
     const base::string16 kOldPassword(form_facebook_.password_value);
@@ skipping 16 matching lines @@
     backend.GetLogins(m_facebook_lookup, &form_list);
 
     // There should be two results -- the exact one, and the PSL-matched one.
     EXPECT_EQ(2u, form_list.size());
     size_t index_non_psl = 0;
     if (!form_list[index_non_psl]->original_signon_realm.empty())
       index_non_psl = 1;
     EXPECT_EQ(kMobileURL, form_list[index_non_psl]->origin);
     EXPECT_EQ(kMobileURL.spec(), form_list[index_non_psl]->signon_realm);
     EXPECT_EQ(kOldPassword, form_list[index_non_psl]->password_value);
-    STLDeleteElements(&form_list);
+    form_list.clear();
 
     // Check that www.facebook.com login was modified by the update.
     backend.GetLogins(form_facebook_, &form_list);
     // There should be two results -- the exact one, and the PSL-matched one.
     EXPECT_EQ(2u, form_list.size());
     index_non_psl = 0;
     if (!form_list[index_non_psl]->original_signon_realm.empty())
       index_non_psl = 1;
     EXPECT_EQ(form_facebook_.origin, form_list[index_non_psl]->origin);
     EXPECT_EQ(form_facebook_.signon_realm,
               form_list[index_non_psl]->signon_realm);
     EXPECT_EQ(kNewPassword, form_list[index_non_psl]->password_value);
-    STLDeleteElements(&form_list);
+    form_list.clear();
   }
 
   // Checks various types of matching for forms with a non-HTML |scheme|.
   void CheckMatchingWithScheme(const PasswordForm::Scheme& scheme) {
     ASSERT_NE(PasswordForm::SCHEME_HTML, scheme);
     other_auth_.scheme = scheme;
 
     // Don't match a non-HTML form with an HTML form.
     EXPECT_FALSE(
         CheckCredentialAvailability(other_auth_, GURL("http://www.example.com"),
@@ skipping 80 matching lines @@
   if (global_mock_libsecret_items.size() > 0)
     CheckMockSecretItem(global_mock_libsecret_items[0], form_google_,
                         "chrome-42");
 }
 
 TEST_F(NativeBackendLibsecretTest, BasicListLogins) {
   NativeBackendLibsecret backend(42);
 
   backend.AddLogin(form_google_);
 
-  std::vector<PasswordForm*> form_list;
+  ScopedVector<autofill::PasswordForm> form_list;
   backend.GetAutofillableLogins(&form_list);
 
   // Quick check that we got something back.
   EXPECT_EQ(1u, form_list.size());
-  STLDeleteElements(&form_list);
+  form_list.clear();
 
   EXPECT_EQ(1u, global_mock_libsecret_items.size());
   if (global_mock_libsecret_items.size() > 0)
     CheckMockSecretItem(global_mock_libsecret_items[0], form_google_,
                         "chrome-42");
 }
 
 // Save a password for www.facebook.com and see it suggested for m.facebook.com.
 TEST_F(NativeBackendLibsecretTest, PSLMatchingPositive) {
   PasswordForm result;
@@ skipping 105 matching lines @@
 
   EXPECT_EQ(1u, global_mock_libsecret_items.size());
   if (global_mock_libsecret_items.size() > 0)
     CheckMockSecretItem(global_mock_libsecret_items[0], form_google_,
                         "chrome-42");
 
   // Attempt to remove a login that doesn't exist.
   backend.RemoveLogin(form_isc_);
 
   // Make sure we can still get the first form back.
-  std::vector<PasswordForm*> form_list;
+  ScopedVector<autofill::PasswordForm> form_list;
   backend.GetAutofillableLogins(&form_list);
 
   // Quick check that we got something back.
   EXPECT_EQ(1u, form_list.size());
-  STLDeleteElements(&form_list);
+  form_list.clear();
 
   EXPECT_EQ(1u, global_mock_libsecret_items.size());
   if (global_mock_libsecret_items.size() > 0)
     CheckMockSecretItem(global_mock_libsecret_items[0], form_google_,
                         "chrome-42");
 }
 
 TEST_F(NativeBackendLibsecretTest, UpdateNonexistentLogin) {
   NativeBackendLibsecret backend(42);
 
@@ skipping 40 matching lines @@
     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.
-  std::vector<PasswordForm*> form_list;
+  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());
-  STLDeleteElements(&form_list);
+  form_list.clear();
 
   EXPECT_EQ(1u, global_mock_libsecret_items.size());
   if (global_mock_libsecret_items.size() > 0)
     CheckMockSecretItem(global_mock_libsecret_items[0], form_google_,
                         "chrome-42");
 }
 
 TEST_F(NativeBackendLibsecretTest, RemoveLoginsCreatedBetween) {
   CheckRemoveLoginsBetween(CREATED);
 }
 
 TEST_F(NativeBackendLibsecretTest, RemoveLoginsSyncedBetween) {
   CheckRemoveLoginsBetween(SYNCED);
 }
 
 // TODO(mdm): add more basic tests here at some point.