PasswordStore: Use ScopedVector to express ownership of forms

chrome/browser/password_manager/password_store_mac.h

 // 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.
 
 #ifndef CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_MAC_H_
 #define CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_MAC_H_
 
 #include <vector>
 
 #include "base/callback_forward.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/memory/scoped_vector.h"
 #include "base/threading/thread.h"
 #include "components/password_manager/core/browser/login_database.h"
 #include "components/password_manager/core/browser/password_store.h"
 
 namespace crypto {
 class AppleKeychain;
 }
 
 namespace password_manager {
 class LoginDatabase;
@@ skipping 51 matching lines @@
       base::Time delete_end) override;
   password_manager::PasswordStoreChangeList RemoveLoginsSyncedBetweenImpl(
       base::Time delete_begin,
       base::Time delete_end) override;
   void GetLoginsImpl(const autofill::PasswordForm& form,
                      AuthorizationPromptPolicy prompt_policy,
                      const ConsumerCallbackRunner& callback_runner) override;
   void GetAutofillableLoginsImpl(GetLoginsRequest* request) override;
   void GetBlacklistLoginsImpl(GetLoginsRequest* request) override;
   bool FillAutofillableLogins(
-      std::vector<autofill::PasswordForm*>* forms) override;
+      ScopedVector<autofill::PasswordForm>* forms) override;
   bool FillBlacklistLogins(
-      std::vector<autofill::PasswordForm*>* forms) override;
+      ScopedVector<autofill::PasswordForm>* forms) override;
 
   // Adds the given form to the Keychain if it's something we want to store
   // there (i.e., not a blacklist entry). Returns true if the operation
   // succeeded (either we added successfully, or we didn't need to).
   bool AddToKeychainIfNecessary(const autofill::PasswordForm& form);
 
   // Returns true if our database contains a form that exactly matches the given
   // keychain form.
   bool DatabaseHasFormMatchingKeychainForm(
       const autofill::PasswordForm& form);
 
   // Removes the given forms from the database.
   void RemoveDatabaseForms(
       const std::vector<autofill::PasswordForm*>& forms);
 
   // Removes the given forms from the Keychain.
   void RemoveKeychainForms(
       const std::vector<autofill::PasswordForm*>& forms);
 
   // Searches the database for forms without a corresponding entry in the
-  // keychain. Removes those forms from the database, and returns them in
-  // |forms|. Ownership of |forms| is passed to the caller.
-  void CleanOrphanedForms(std::vector<autofill::PasswordForm*>* forms);
+  // keychain. Removes those forms from the database, and adds them to
+  // |orphaned_forms|.
+  void CleanOrphanedForms(ScopedVector<autofill::PasswordForm>* orphaned_forms);
 
   scoped_ptr<crypto::AppleKeychain> keychain_;
 
   // The login metadata SQL database. The LoginDatabase instance is received via
   // the in an uninitialized state, so as to allow injecting mocks, then Init()
   // is called on the DB thread in a deferred manner. If opening the DB fails,
   // |login_metadata_db_| will be reset to NULL for the lifetime of |this|.
   scoped_ptr<password_manager::LoginDatabase> login_metadata_db_;
 
   // Thread that the synchronous methods are run on.
   scoped_ptr<base::Thread> thread_;
 
   DISALLOW_COPY_AND_ASSIGN(PasswordStoreMac);
 };
 
 #endif  // CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_MAC_H_