| Index: components/user_prefs/tracked/pref_hash_store_impl.cc
|
| diff --git a/components/user_prefs/tracked/pref_hash_store_impl.cc b/components/user_prefs/tracked/pref_hash_store_impl.cc
|
| index 820c0984b848c0a4929a967ecd224c3edbaa154f..125f662f66d92d39123646953aec982481da638a 100644
|
| --- a/components/user_prefs/tracked/pref_hash_store_impl.cc
|
| +++ b/components/user_prefs/tracked/pref_hash_store_impl.cc
|
| @@ -5,6 +5,7 @@
|
| #include "components/user_prefs/tracked/pref_hash_store_impl.h"
|
|
|
| #include <stddef.h>
|
| +#include <utility>
|
|
|
| #include "base/logging.h"
|
| #include "base/macros.h"
|
| @@ -74,20 +75,20 @@ PrefHashStoreImpl::~PrefHashStoreImpl() {
|
|
|
| void PrefHashStoreImpl::set_legacy_hash_store_contents(
|
| scoped_ptr<HashStoreContents> legacy_hash_store_contents) {
|
| - legacy_hash_store_contents_ = legacy_hash_store_contents.Pass();
|
| + legacy_hash_store_contents_ = std::move(legacy_hash_store_contents);
|
| }
|
|
|
| scoped_ptr<PrefHashStoreTransaction> PrefHashStoreImpl::BeginTransaction(
|
| scoped_ptr<HashStoreContents> storage) {
|
| return scoped_ptr<PrefHashStoreTransaction>(
|
| - new PrefHashStoreTransactionImpl(this, storage.Pass()));
|
| + new PrefHashStoreTransactionImpl(this, std::move(storage)));
|
| }
|
|
|
| PrefHashStoreImpl::PrefHashStoreTransactionImpl::PrefHashStoreTransactionImpl(
|
| PrefHashStoreImpl* outer,
|
| scoped_ptr<HashStoreContents> storage)
|
| : outer_(outer),
|
| - contents_(storage.Pass()),
|
| + contents_(std::move(storage)),
|
| super_mac_valid_(false),
|
| super_mac_dirty_(false) {
|
| if (!outer_->use_super_mac_)
|
|
|