PasswordStore: Use ScopedVector to express ownership of forms

chrome/browser/password_manager/native_backend_gnome_x_unittest.cc

 // Copyright (c) 2012 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"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "chrome/browser/password_manager/native_backend_gnome_x.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/autofill/core/common/password_form.h"
 #include "components/password_manager/core/browser/psl_matching_helper.h"
 #include "components/password_manager/core/common/password_manager_pref_names.h"
@@ skipping 475 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;
     BrowserThread::PostTask(
         BrowserThread::DB,
         FROM_HERE,
         base::Bind(base::IgnoreResult(&NativeBackendGnome::GetLogins),
                    base::Unretained(&backend),
                    target_form,
                    &form_list));
 
     RunBothThreads();
 
     EXPECT_EQ(1u, mock_keyring_items.size());
     if (mock_keyring_items.size() > 0)
       CheckMockKeyringItem(&mock_keyring_items[0], credentials, "chrome-321");
     mock_keyring_items.clear();
 
     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) {
     NativeBackendGnome backend(321);
     backend.Init();
 
     // Add |form_facebook_| to saved logins.
     BrowserThread::PostTask(
         BrowserThread::DB,
         FROM_HERE,
         base::Bind(base::IgnoreResult(&NativeBackendGnome::AddLogin),
                    base::Unretained(&backend),
                    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;
     BrowserThread::PostTask(
         BrowserThread::DB,
         FROM_HERE,
         base::Bind(base::IgnoreResult(&NativeBackendGnome::GetLogins),
                    base::Unretained(&backend),
                    m_facebook_lookup,
                    &form_list));
     RunBothThreads();
     EXPECT_EQ(1u, mock_keyring_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.
     BrowserThread::PostTask(
         BrowserThread::DB,
         FROM_HERE,
         base::Bind(base::IgnoreResult(&NativeBackendGnome::AddLogin),
                    base::Unretained(&backend),
                    m_facebook));
@@ skipping 39 matching lines @@
                    &form_list));
     RunBothThreads();
     // 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.
     BrowserThread::PostTask(
         BrowserThread::DB,
         FROM_HERE,
         base::Bind(base::IgnoreResult(&NativeBackendGnome::GetLogins),
                    base::Unretained(&backend),
                    form_facebook_,
                    &form_list));
     RunBothThreads();
     // 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);
   }
 
   void CheckMatchingWithScheme(const PasswordForm::Scheme& 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"),
         PasswordForm::SCHEME_HTML, NULL));
     // Don't match an HTML form with non-HTML auth form.
@@ skipping 113 matching lines @@
 
 TEST_F(NativeBackendGnomeTest, BasicListLogins) {
   NativeBackendGnome backend(42);
   backend.Init();
 
   BrowserThread::PostTask(
       BrowserThread::DB, FROM_HERE,
       base::Bind(base::IgnoreResult( &NativeBackendGnome::AddLogin),
                  base::Unretained(&backend), form_google_));
 
-  std::vector<PasswordForm*> form_list;
+  ScopedVector<autofill::PasswordForm> form_list;
   BrowserThread::PostTask(
       BrowserThread::DB, FROM_HERE,
       base::Bind(
           base::IgnoreResult(&NativeBackendGnome::GetAutofillableLogins),
           base::Unretained(&backend), &form_list));
 
   RunBothThreads();
 
   // Quick check that we got something back.
   EXPECT_EQ(1u, form_list.size());
-  STLDeleteElements(&form_list);
 
   EXPECT_EQ(1u, mock_keyring_items.size());
   if (mock_keyring_items.size() > 0)
     CheckMockKeyringItem(&mock_keyring_items[0], form_google_, "chrome-42");
 }
 
 // Save a password for www.facebook.com and see it suggested for m.facebook.com.
 TEST_F(NativeBackendGnomeTest, PSLMatchingPositive) {
   PasswordForm result;
   const GURL kMobileURL("http://m.facebook.com/");
@@ skipping 145 matching lines @@
   if (mock_keyring_items.size() > 0)
     CheckMockKeyringItem(&mock_keyring_items[0], form_google_, "chrome-42");
 
   // Attempt to remove a login that doesn't exist.
   BrowserThread::PostTask(
       BrowserThread::DB, FROM_HERE,
       base::Bind(base::IgnoreResult(&NativeBackendGnome::RemoveLogin),
                  base::Unretained(&backend), form_isc_));
 
   // Make sure we can still get the first form back.
-  std::vector<PasswordForm*> form_list;
+  ScopedVector<autofill::PasswordForm> form_list;
   BrowserThread::PostTask(
       BrowserThread::DB, FROM_HERE,
       base::Bind(
           base::IgnoreResult(&NativeBackendGnome::GetAutofillableLogins),
           base::Unretained(&backend), &form_list));
 
   RunBothThreads();
 
   // Quick check that we got something back.
   EXPECT_EQ(1u, form_list.size());
-  STLDeleteElements(&form_list);
 
   EXPECT_EQ(1u, mock_keyring_items.size());
   if (mock_keyring_items.size() > 0)
     CheckMockKeyringItem(&mock_keyring_items[0], form_google_, "chrome-42");
 }
 
 TEST_F(NativeBackendGnomeTest, UpdateNonexistentLogin) {
   NativeBackendGnome backend(42);
   backend.Init();
 
@@ skipping 62 matching lines @@
 TEST_F(NativeBackendGnomeTest, ListLoginsAppends) {
   NativeBackendGnome backend(42);
   backend.Init();
 
   BrowserThread::PostTask(
       BrowserThread::DB, FROM_HERE,
       base::Bind(base::IgnoreResult(&NativeBackendGnome::AddLogin),
                  base::Unretained(&backend), form_google_));
 
   // Send the same request twice with the same list both times.
-  std::vector<PasswordForm*> form_list;
+  ScopedVector<autofill::PasswordForm> form_list;
   BrowserThread::PostTask(
       BrowserThread::DB, FROM_HERE,
       base::Bind(
           base::IgnoreResult(&NativeBackendGnome::GetAutofillableLogins),
           base::Unretained(&backend), &form_list));
   BrowserThread::PostTask(
       BrowserThread::DB, FROM_HERE,
       base::Bind(
           base::IgnoreResult(&NativeBackendGnome::GetAutofillableLogins),
           base::Unretained(&backend), &form_list));
 
   RunBothThreads();
 
   // Quick check that we got two results back.
   EXPECT_EQ(2u, form_list.size());
-  STLDeleteElements(&form_list);
 
   EXPECT_EQ(1u, mock_keyring_items.size());
   if (mock_keyring_items.size() > 0)
     CheckMockKeyringItem(&mock_keyring_items[0], form_google_, "chrome-42");
 }
 
 TEST_F(NativeBackendGnomeTest, RemoveLoginsCreatedBetween) {
   CheckRemoveLoginsBetween(CREATED);
 }
 
 TEST_F(NativeBackendGnomeTest, RemoveLoginsSyncedBetween) {
   CheckRemoveLoginsBetween(SYNCED);
 }
 
 // TODO(mdm): add more basic tests here at some point.