Index: extensions/common/extension_builder.h |
diff --git a/extensions/common/extension_builder.h b/extensions/common/extension_builder.h |
index 5fe9801a6024f7985285ec57e7ff529a33558316..c6d5ab6e20b45e21a5b8a4847e3adbf3d3adbe36 100644 |
--- a/extensions/common/extension_builder.h |
+++ b/extensions/common/extension_builder.h |
@@ -5,12 +5,12 @@ |
#ifndef EXTENSIONS_COMMON_EXTENSION_BUILDER_H_ |
#define EXTENSIONS_COMMON_EXTENSION_BUILDER_H_ |
+#include <memory> |
#include <string> |
#include "base/files/file_path.h" |
#include "base/macros.h" |
#include "base/memory/ref_counted.h" |
-#include "base/memory/scoped_ptr.h" |
#include "extensions/common/manifest.h" |
#include "extensions/common/value_builder.h" |
@@ -39,11 +39,13 @@ class ExtensionBuilder { |
// Defaults to Manifest::UNPACKED. |
ExtensionBuilder& SetLocation(Manifest::Location location); |
- ExtensionBuilder& SetManifest(scoped_ptr<base::DictionaryValue> manifest); |
+ ExtensionBuilder& SetManifest( |
+ std::unique_ptr<base::DictionaryValue> manifest); |
// Merge another manifest into the current manifest, with new keys taking |
// precedence. |
- ExtensionBuilder& MergeManifest(scoped_ptr<base::DictionaryValue> manifest); |
+ ExtensionBuilder& MergeManifest( |
+ std::unique_ptr<base::DictionaryValue> manifest); |
ExtensionBuilder& AddFlags(int init_from_value_flags); |
@@ -53,7 +55,7 @@ class ExtensionBuilder { |
private: |
base::FilePath path_; |
Manifest::Location location_; |
- scoped_ptr<base::DictionaryValue> manifest_; |
+ std::unique_ptr<base::DictionaryValue> manifest_; |
int flags_; |
std::string id_; |