Index: extensions/common/extension_builder.h |
diff --git a/extensions/common/extension_builder.h b/extensions/common/extension_builder.h |
index 4734baa876b415d2816530c463c5684a66a6cbbe..5fe9801a6024f7985285ec57e7ff529a33558316 100644 |
--- a/extensions/common/extension_builder.h |
+++ b/extensions/common/extension_builder.h |
@@ -40,13 +40,10 @@ class ExtensionBuilder { |
ExtensionBuilder& SetLocation(Manifest::Location location); |
ExtensionBuilder& SetManifest(scoped_ptr<base::DictionaryValue> manifest); |
- ExtensionBuilder& SetManifest(DictionaryBuilder manifest_builder) { |
- return SetManifest(manifest_builder.Build()); |
- } |
- // Adds the keys from the DictionaryBuilder to the manifest, with new keys |
- // taking precedence. |
- ExtensionBuilder& MergeManifest(DictionaryBuilder& builder); |
+ // Merge another manifest into the current manifest, with new keys taking |
+ // precedence. |
+ ExtensionBuilder& MergeManifest(scoped_ptr<base::DictionaryValue> manifest); |
ExtensionBuilder& AddFlags(int init_from_value_flags); |