| Index: components/prefs/testing_pref_store.h
|
| diff --git a/components/prefs/testing_pref_store.h b/components/prefs/testing_pref_store.h
|
| index 8fb4b8d2c24313311085cea0ffc281252d6f1a47..2bf2c8f72b113e8ac4b47be402efbe7df2ebc603 100644
|
| --- a/components/prefs/testing_pref_store.h
|
| +++ b/components/prefs/testing_pref_store.h
|
| @@ -34,10 +34,10 @@ class TestingPrefStore : public PersistentPrefStore {
|
| bool GetMutableValue(const std::string& key, base::Value** result) override;
|
| void ReportValueChanged(const std::string& key, uint32_t flags) override;
|
| void SetValue(const std::string& key,
|
| - scoped_ptr<base::Value> value,
|
| + std::unique_ptr<base::Value> value,
|
| uint32_t flags) override;
|
| void SetValueSilently(const std::string& key,
|
| - scoped_ptr<base::Value> value,
|
| + std::unique_ptr<base::Value> value,
|
| uint32_t flags) override;
|
| void RemoveValue(const std::string& key, uint32_t flags) override;
|
| bool ReadOnly() const override;
|
| @@ -107,7 +107,7 @@ class TestingPrefStore : public PersistentPrefStore {
|
| // mutation.
|
| bool committed_;
|
|
|
| - scoped_ptr<ReadErrorDelegate> error_delegate_;
|
| + std::unique_ptr<ReadErrorDelegate> error_delegate_;
|
| base::ObserverList<PrefStore::Observer, true> observers_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(TestingPrefStore);
|
|
|