PasswordStore: Use ScopedVector to express ownership of forms

chrome/browser/password_manager/password_store_x.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_X_H_
 #define CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_X_H_
 
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
+#include "base/memory/scoped_vector.h"
 #include "base/time/time.h"
 #include "components/password_manager/core/browser/password_store_default.h"
 
 class PrefService;
 
 namespace user_prefs {
 class PrefRegistrySyncable;
 }
 
 namespace password_manager {
 class LoginDatabase;
 }
 
 // PasswordStoreX is used on Linux and other non-Windows, non-Mac OS X
 // operating systems. It uses a "native backend" to actually store the password
 // data when such a backend is available, and otherwise falls back to using the
 // login database like PasswordStoreDefault. It also handles automatically
 // migrating password data to a native backend from the login database.
 //
 // There are currently native backends for GNOME Keyring and KWallet.
 class PasswordStoreX : public password_manager::PasswordStoreDefault {
  public:
   // NativeBackends more or less implement the PaswordStore interface, but
   // with return values rather than implicit consumer notification.
   class NativeBackend {
    public:
-    typedef std::vector<autofill::PasswordForm*> PasswordFormList;
-
     virtual ~NativeBackend() {}
 
     virtual bool Init() = 0;
 
     virtual password_manager::PasswordStoreChangeList AddLogin(
         const autofill::PasswordForm& form) = 0;
     virtual bool UpdateLogin(
         const autofill::PasswordForm& form,
         password_manager::PasswordStoreChangeList* changes) = 0;
     virtual bool RemoveLogin(const autofill::PasswordForm& form) = 0;
 
     // Removes all logins created/synced from |delete_begin| onwards (inclusive)
     // and before |delete_end|. You may use a null Time value to do an unbounded
     // delete in either direction.
     virtual bool RemoveLoginsCreatedBetween(
         base::Time delete_begin,
         base::Time delete_end,
         password_manager::PasswordStoreChangeList* changes) = 0;
     virtual bool RemoveLoginsSyncedBetween(
         base::Time delete_begin,
         base::Time delete_end,
         password_manager::PasswordStoreChangeList* changes) = 0;
 
     virtual bool GetLogins(const autofill::PasswordForm& form,
-                           PasswordFormList* forms) = 0;
-    virtual bool GetAutofillableLogins(PasswordFormList* forms) = 0;
-    virtual bool GetBlacklistLogins(PasswordFormList* forms) = 0;
+                           ScopedVector<autofill::PasswordForm>* forms) = 0;
+    virtual bool GetAutofillableLogins(
+        ScopedVector<autofill::PasswordForm>* forms) = 0;
+    virtual bool GetBlacklistLogins(
+        ScopedVector<autofill::PasswordForm>* forms) = 0;
   };
 
   // Takes ownership of |login_db| and |backend|. |backend| may be NULL in which
   // case this PasswordStoreX will act the same as PasswordStoreDefault.
   PasswordStoreX(scoped_refptr<base::SingleThreadTaskRunner> main_thread_runner,
                  scoped_refptr<base::SingleThreadTaskRunner> db_thread_runner,
                  scoped_ptr<password_manager::LoginDatabase> login_db,
                  NativeBackend* backend);
 
  private:
@@ skipping 13 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;
 
   // Sort logins by origin, like the ORDER BY clause in login_database.cc.
-  void SortLoginsByOrigin(NativeBackend::PasswordFormList* list);
+  void SortLoginsByOrigin(std::vector<autofill::PasswordForm*>* list);
 
   // Check to see whether migration is necessary, and perform it if so.
   void CheckMigration();
 
   // Return true if we should try using the native backend.
   bool use_native_backend() { return !!backend_.get(); }
 
   // Return true if we can fall back on the default store, warning the first
   // time we call it when falling back is necessary. See |allow_fallback_|.
   bool allow_default_store();
@@ skipping 11 matching lines @@
   // Whether we should allow falling back to the default store. If there is
   // nothing to migrate, then the first attempt to use the native store will
   // be the first time we try to use it and we should allow falling back. If
   // we have migrated successfully, then we do not allow falling back.
   bool allow_fallback_;
 
   DISALLOW_COPY_AND_ASSIGN(PasswordStoreX);
 };
 
 #endif  // CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_X_H_