| Index: extensions/browser/value_store/value_store_unittest.h
|
| diff --git a/extensions/browser/value_store/value_store_unittest.h b/extensions/browser/value_store/value_store_unittest.h
|
| index f50e6902570fd8ce82319be2ba733d553037b8a1..d433ab9cc9cfb02b5cb0d21e50daa1d1f1d4923f 100644
|
| --- a/extensions/browser/value_store/value_store_unittest.h
|
| +++ b/extensions/browser/value_store/value_store_unittest.h
|
| @@ -5,9 +5,10 @@
|
| #ifndef EXTENSIONS_BROWSER_VALUE_STORE_VALUE_STORE_UNITTEST_H_
|
| #define EXTENSIONS_BROWSER_VALUE_STORE_VALUE_STORE_UNITTEST_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/files/scoped_temp_dir.h"
|
| #include "base/memory/ref_counted.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/message_loop/message_loop.h"
|
| #include "content/public/test/test_browser_thread.h"
|
| #include "extensions/browser/value_store/value_store.h"
|
| @@ -28,15 +29,15 @@ class ValueStoreTest : public testing::TestWithParam<ValueStoreTestParam> {
|
| void TearDown() override;
|
|
|
| protected:
|
| - scoped_ptr<ValueStore> storage_;
|
| + std::unique_ptr<ValueStore> storage_;
|
|
|
| std::string key1_;
|
| std::string key2_;
|
| std::string key3_;
|
|
|
| - scoped_ptr<base::Value> val1_;
|
| - scoped_ptr<base::Value> val2_;
|
| - scoped_ptr<base::Value> val3_;
|
| + std::unique_ptr<base::Value> val1_;
|
| + std::unique_ptr<base::Value> val2_;
|
| + std::unique_ptr<base::Value> val3_;
|
|
|
| std::vector<std::string> empty_list_;
|
| std::vector<std::string> list1_;
|
| @@ -54,11 +55,11 @@ class ValueStoreTest : public testing::TestWithParam<ValueStoreTestParam> {
|
| std::set<std::string> set13_;
|
| std::set<std::string> set123_;
|
|
|
| - scoped_ptr<base::DictionaryValue> empty_dict_;
|
| - scoped_ptr<base::DictionaryValue> dict1_;
|
| - scoped_ptr<base::DictionaryValue> dict3_;
|
| - scoped_ptr<base::DictionaryValue> dict12_;
|
| - scoped_ptr<base::DictionaryValue> dict123_;
|
| + std::unique_ptr<base::DictionaryValue> empty_dict_;
|
| + std::unique_ptr<base::DictionaryValue> dict1_;
|
| + std::unique_ptr<base::DictionaryValue> dict3_;
|
| + std::unique_ptr<base::DictionaryValue> dict12_;
|
| + std::unique_ptr<base::DictionaryValue> dict123_;
|
|
|
| private:
|
| base::ScopedTempDir temp_dir_;
|
|
|