| Index: extensions/common/extension_builder.cc
|
| diff --git a/extensions/common/extension_builder.cc b/extensions/common/extension_builder.cc
|
| index 905ba6b2dfa2edcc27f64bf6d21c822c17f60d42..e00db3cb3dbc4f1b01e4f4a86b1ac30b34915c68 100644
|
| --- a/extensions/common/extension_builder.cc
|
| +++ b/extensions/common/extension_builder.cc
|
| @@ -56,13 +56,13 @@ ExtensionBuilder& ExtensionBuilder::SetLocation(Manifest::Location location) {
|
| }
|
|
|
| ExtensionBuilder& ExtensionBuilder::SetManifest(
|
| - scoped_ptr<base::DictionaryValue> manifest) {
|
| + std::unique_ptr<base::DictionaryValue> manifest) {
|
| manifest_ = std::move(manifest);
|
| return *this;
|
| }
|
|
|
| ExtensionBuilder& ExtensionBuilder::MergeManifest(
|
| - scoped_ptr<base::DictionaryValue> manifest) {
|
| + std::unique_ptr<base::DictionaryValue> manifest) {
|
| manifest_->MergeDictionary(manifest.get());
|
| return *this;
|
| }
|
|
|