| Index: chrome/browser/password_manager/native_backend_gnome_x.h
|
| diff --git a/chrome/browser/password_manager/native_backend_gnome_x.h b/chrome/browser/password_manager/native_backend_gnome_x.h
|
| index 63edd8b27414af5fd31057936902dad1276e7e67..97801941377b81e267cbc9ad67f0027ceb7b6721 100644
|
| --- a/chrome/browser/password_manager/native_backend_gnome_x.h
|
| +++ b/chrome/browser/password_manager/native_backend_gnome_x.h
|
| @@ -5,11 +5,12 @@
|
| #ifndef CHROME_BROWSER_PASSWORD_MANAGER_NATIVE_BACKEND_GNOME_X_H_
|
| #define CHROME_BROWSER_PASSWORD_MANAGER_NATIVE_BACKEND_GNOME_X_H_
|
|
|
| +#include <memory>
|
| #include <string>
|
| +#include <vector>
|
|
|
| #include "base/compiler_specific.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_vector.h"
|
| #include "base/time/time.h"
|
| #include "chrome/browser/password_manager/password_store_factory.h"
|
| #include "chrome/browser/password_manager/password_store_x.h"
|
| @@ -48,12 +49,15 @@ class NativeBackendGnome : public PasswordStoreX::NativeBackend,
|
| bool DisableAutoSignInForOrigins(
|
| const base::Callback<bool(const GURL&)>& origin_filter,
|
| password_manager::PasswordStoreChangeList* changes) override;
|
| - bool GetLogins(const password_manager::PasswordStore::FormDigest& form,
|
| - ScopedVector<autofill::PasswordForm>* forms) override;
|
| + bool GetLogins(
|
| + const password_manager::PasswordStore::FormDigest& form,
|
| + std::vector<std::unique_ptr<autofill::PasswordForm>>* forms) override;
|
| bool GetAutofillableLogins(
|
| - ScopedVector<autofill::PasswordForm>* forms) override;
|
| - bool GetBlacklistLogins(ScopedVector<autofill::PasswordForm>* forms) override;
|
| - bool GetAllLogins(ScopedVector<autofill::PasswordForm>* forms) override;
|
| + std::vector<std::unique_ptr<autofill::PasswordForm>>* forms) override;
|
| + bool GetBlacklistLogins(
|
| + std::vector<std::unique_ptr<autofill::PasswordForm>>* forms) override;
|
| + bool GetAllLogins(
|
| + std::vector<std::unique_ptr<autofill::PasswordForm>>* forms) override;
|
|
|
| private:
|
| enum TimestampToCompare {
|
| @@ -68,16 +72,16 @@ class NativeBackendGnome : public PasswordStoreX::NativeBackend,
|
| // |autofillable|) from the keyring into |forms|, overwriting the original
|
| // contents of |forms|. Returns true on success.
|
| bool GetLoginsList(bool autofillable,
|
| - ScopedVector<autofill::PasswordForm>* forms)
|
| - WARN_UNUSED_RESULT;
|
| + std::vector<std::unique_ptr<autofill::PasswordForm>>*
|
| + forms) WARN_UNUSED_RESULT;
|
|
|
| // Retrieves password created/synced in the time interval. Returns |true| if
|
| // the operation succeeded.
|
| bool GetLoginsBetween(base::Time get_begin,
|
| base::Time get_end,
|
| TimestampToCompare date_to_compare,
|
| - ScopedVector<autofill::PasswordForm>* forms)
|
| - WARN_UNUSED_RESULT;
|
| + std::vector<std::unique_ptr<autofill::PasswordForm>>*
|
| + forms) WARN_UNUSED_RESULT;
|
|
|
| // Removes password created/synced in the time interval. Returns |true| if the
|
| // operation succeeded. |changes| will contain the changes applied.
|
|
|