summaryrefslogtreecommitdiffstats
path: root/extensions/common/features/base_feature_provider.h
diff options
context:
space:
mode:
Diffstat (limited to 'extensions/common/features/base_feature_provider.h')
-rw-r--r--extensions/common/features/base_feature_provider.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/extensions/common/features/base_feature_provider.h b/extensions/common/features/base_feature_provider.h
index e82c46d..3b766c8 100644
--- a/extensions/common/features/base_feature_provider.h
+++ b/extensions/common/features/base_feature_provider.h
@@ -9,11 +9,14 @@
#include <string>
#include <vector>
-#include "base/memory/linked_ptr.h"
-#include "base/values.h"
+#include "base/memory/scoped_ptr.h"
#include "extensions/common/features/feature_provider.h"
#include "extensions/common/features/simple_feature.h"
+namespace Base {
+class DictionaryValue;
+}
+
namespace extensions {
// Reads Features out of a simple JSON file description.
@@ -35,8 +38,7 @@ class BaseFeatureProvider : public FeatureProvider {
const std::vector<std::string>& GetAllFeatureNames() const override;
private:
- typedef std::map<std::string, linked_ptr<Feature> > FeatureMap;
- FeatureMap features_;
+ std::map<std::string, scoped_ptr<Feature>> features_;
// Populated on first use.
mutable std::vector<std::string> feature_names_;