| Index: extensions/browser/value_store/legacy_value_store_factory.h
|
| diff --git a/extensions/browser/value_store/legacy_value_store_factory.h b/extensions/browser/value_store/legacy_value_store_factory.h
|
| index 65db0275a7197e6f31aadff5f5a956b12c7d8552..59517543b6b1ba07ec67a24de25934f98dde3840 100644
|
| --- a/extensions/browser/value_store/legacy_value_store_factory.h
|
| +++ b/extensions/browser/value_store/legacy_value_store_factory.h
|
| @@ -5,12 +5,12 @@
|
| #ifndef EXTENSIONS_BROWSER_VALUE_STORE_LEGACY_VALUE_STORE_FACTORY_H_
|
| #define EXTENSIONS_BROWSER_VALUE_STORE_LEGACY_VALUE_STORE_FACTORY_H_
|
|
|
| +#include <memory>
|
| #include <set>
|
| #include <string>
|
|
|
| #include "base/files/file_path.h"
|
| #include "base/memory/ref_counted.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "extensions/browser/value_store/value_store.h"
|
| #include "extensions/browser/value_store/value_store_factory.h"
|
| #include "extensions/common/extension.h"
|
| @@ -28,9 +28,9 @@ class LegacyValueStoreFactory : public ValueStoreFactory {
|
| bool StateDBExists() const;
|
|
|
| // ValueStoreFactory:
|
| - scoped_ptr<ValueStore> CreateRulesStore() override;
|
| - scoped_ptr<ValueStore> CreateStateStore() override;
|
| - scoped_ptr<ValueStore> CreateSettingsStore(
|
| + std::unique_ptr<ValueStore> CreateRulesStore() override;
|
| + std::unique_ptr<ValueStore> CreateStateStore() override;
|
| + std::unique_ptr<ValueStore> CreateSettingsStore(
|
| settings_namespace::Namespace settings_namespace,
|
| ModelType model_type,
|
| const ExtensionId& extension_id) override;
|
| @@ -82,8 +82,8 @@ class LegacyValueStoreFactory : public ValueStoreFactory {
|
| ModelSettings* GetModel(ModelType model_type);
|
|
|
| private:
|
| - scoped_ptr<ModelSettings> extensions_;
|
| - scoped_ptr<ModelSettings> apps_;
|
| + std::unique_ptr<ModelSettings> extensions_;
|
| + std::unique_ptr<ModelSettings> apps_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(SettingsRoot);
|
| };
|
|
|