| Index: components/autofill/core/browser/webdata/autofill_webdata_backend_impl.h
|
| diff --git a/components/autofill/core/browser/webdata/autofill_webdata_backend_impl.h b/components/autofill/core/browser/webdata/autofill_webdata_backend_impl.h
|
| index f0bcb63c58187b1870924d5b9bd4e98beb5f36eb..29c09416398fb1f8dddf5e943e5d2993247dec1e 100644
|
| --- a/components/autofill/core/browser/webdata/autofill_webdata_backend_impl.h
|
| +++ b/components/autofill/core/browser/webdata/autofill_webdata_backend_impl.h
|
| @@ -5,10 +5,11 @@
|
| #ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_WEBDATA_AUTOFILL_WEBDATA_BACKEND_IMPL_H_
|
| #define COMPONENTS_AUTOFILL_CORE_BROWSER_WEBDATA_AUTOFILL_WEBDATA_BACKEND_IMPL_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/macros.h"
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/ref_counted_delete_on_message_loop.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/observer_list.h"
|
| #include "base/supports_user_data.h"
|
| #include "components/autofill/core/browser/webdata/autofill_webdata.h"
|
| @@ -75,7 +76,7 @@ class AutofillWebDataBackendImpl
|
|
|
| // Returns a vector of values which have been entered in form input fields
|
| // named |name|.
|
| - scoped_ptr<WDTypedResult> GetFormValuesForElementName(
|
| + std::unique_ptr<WDTypedResult> GetFormValuesForElementName(
|
| const base::string16& name,
|
| const base::string16& prefix,
|
| int limit,
|
| @@ -109,13 +110,13 @@ class AutofillWebDataBackendImpl
|
| WebDatabase* db);
|
|
|
| // Returns the local/server Autofill profiles from the web database.
|
| - scoped_ptr<WDTypedResult> GetAutofillProfiles(WebDatabase* db);
|
| - scoped_ptr<WDTypedResult> GetServerProfiles(WebDatabase* db);
|
| + std::unique_ptr<WDTypedResult> GetAutofillProfiles(WebDatabase* db);
|
| + std::unique_ptr<WDTypedResult> GetServerProfiles(WebDatabase* db);
|
|
|
| // Returns the number of values such that all for autofill entries with that
|
| // value, the interval between creation date and last usage is entirely
|
| // contained between [|begin|, |end|).
|
| - scoped_ptr<WDTypedResult> GetCountOfValuesContainedBetween(
|
| + std::unique_ptr<WDTypedResult> GetCountOfValuesContainedBetween(
|
| const base::Time& begin,
|
| const base::Time& end,
|
| WebDatabase* db);
|
| @@ -138,8 +139,8 @@ class AutofillWebDataBackendImpl
|
| WebDatabase* db);
|
|
|
| // Returns a vector of local/server credit cards from the web database.
|
| - scoped_ptr<WDTypedResult> GetCreditCards(WebDatabase* db);
|
| - scoped_ptr<WDTypedResult> GetServerCreditCards(WebDatabase* db);
|
| + std::unique_ptr<WDTypedResult> GetCreditCards(WebDatabase* db);
|
| + std::unique_ptr<WDTypedResult> GetServerCreditCards(WebDatabase* db);
|
|
|
| // Server credit cards can be masked (only last 4 digits stored) or unmasked
|
| // (all data stored). These toggle between the two states.
|
| @@ -202,7 +203,7 @@ class AutofillWebDataBackendImpl
|
| // Storage for user data to be accessed only on the DB thread. May
|
| // be used e.g. for SyncableService subclasses that need to be owned
|
| // by this object. Is created on first call to |GetDBUserData()|.
|
| - scoped_ptr<SupportsUserDataAggregatable> user_data_;
|
| + std::unique_ptr<SupportsUserDataAggregatable> user_data_;
|
|
|
| WebDatabase::State RemoveExpiredFormElementsImpl(WebDatabase* db);
|
|
|
|
|