Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6197)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/common/extensions/api/file_browser_handlers/file_browser_handler_manifest_unittest.cc

Issue 1739183003: Make extensions::DictionaryBuilder and extensions::ListValue unmovable. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/extensions/activity_log/activity_log_policy_unittest.cc ('K') | « chrome/common/extensions/api/extension_action/browser_action_manifest_unittest.cc ('k') | chrome/common/extensions/features/chrome_channel_feature_filter_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/extensions/api/file_browser_handlers/file_browser_handler_manifest_unittest.cc
diff --git a/chrome/common/extensions/api/file_browser_handlers/file_browser_handler_manifest_unittest.cc b/chrome/common/extensions/api/file_browser_handlers/file_browser_handler_manifest_unittest.cc
index 66f10a229aadf0dfb7656acd334bdfd39d58ef6d..97e65eaef171c8025bc7391d6d244f911c49b3cf 100644
--- a/chrome/common/extensions/api/file_browser_handlers/file_browser_handler_manifest_unittest.cc
+++ b/chrome/common/extensions/api/file_browser_handlers/file_browser_handler_manifest_unittest.cc
@@ -37,24 +37,25 @@ TEST_F(FileBrowserHandlerManifestTest, GetHandlersRequiresPermission) {
.Set("version", "1.0.0")
.Set("manifest_version", 2)
.Set("file_browser_handlers",
- std::move(extensions::ListBuilder().Append(std::move(
- extensions::DictionaryBuilder()
- .Set("id", "open")
- .Set("default_title", "open")
- .Set("file_filters",
- std::move(extensions::ListBuilder()
- .Append("filesystem:*.txt")
- .Append("filesystem:*.html")))))));
+ extensions::ListBuilder()
+ .Append(extensions::DictionaryBuilder()
+ .Set("id", "open")
+ .Set("default_title", "open")
+ .Set("file_filters", extensions::ListBuilder()
+ .Append("filesystem:*.txt")
+ .Append("filesystem:*.html")
+ .Build())
+ .Build())
+ .Build());
scoped_ptr<base::DictionaryValue> bad_manifest_value(
bad_manifest_builder.Build());
// Create a good manifest by extending the bad one with the missing
// permission.
- extensions::DictionaryBuilder good_manifest_builder(
- *make_scoped_ptr(bad_manifest_value->DeepCopy()).get());
+ extensions::DictionaryBuilder good_manifest_builder(*bad_manifest_value);
good_manifest_builder.Set(
"permissions",
- std::move(extensions::ListBuilder().Append("fileBrowserHandler")));
+ extensions::ListBuilder().Append("fileBrowserHandler").Build());
extensions::ExtensionBuilder bad_app_builder;
bad_app_builder.SetManifest(std::move(bad_manifest_value));
@@ -62,7 +63,7 @@ TEST_F(FileBrowserHandlerManifestTest, GetHandlersRequiresPermission) {
EXPECT_FALSE(FileBrowserHandler::GetHandlers(bad_app.get()));
extensions::ExtensionBuilder good_app_builder;
- good_app_builder.SetManifest(std::move(good_manifest_builder));
+ good_app_builder.SetManifest(good_manifest_builder.Build());
scoped_refptr<extensions::Extension> good_app(good_app_builder.Build());
EXPECT_TRUE(FileBrowserHandler::GetHandlers(good_app.get()));
}
@@ -104,22 +105,26 @@ TEST_F(FileBrowserHandlerManifestTest, ValidFileBrowserHandler) {
scoped_refptr<const Extension> extension =
ExtensionBuilder()
.SetManifest(
- std::move(DictionaryBuilder()
- .Set("name", "file browser handler test")
- .Set("version", "1.0.0")
- .Set("manifest_version", 2)
- .Set("permissions",
- std::move(extensions::ListBuilder().Append(
- "fileBrowserHandler")))
- .Set("file_browser_handlers",
- std::move(ListBuilder().Append(std::move(
- DictionaryBuilder()
- .Set("id", "ExtremelyCoolAction")
- .Set("default_title", "Be Amazed")
- .Set("default_icon", "icon.png")
- .Set("file_filters",
- std::move(ListBuilder().Append(
- "filesystem:*.txt")))))))))
+ DictionaryBuilder()
+ .Set("name", "file browser handler test")
+ .Set("version", "1.0.0")
+ .Set("manifest_version", 2)
+ .Set("permissions", extensions::ListBuilder()
+ .Append("fileBrowserHandler")
+ .Build())
+ .Set("file_browser_handlers",
+ ListBuilder()
+ .Append(DictionaryBuilder()
+ .Set("id", "ExtremelyCoolAction")
+ .Set("default_title", "Be Amazed")
+ .Set("default_icon", "icon.png")
+ .Set("file_filters",
+ ListBuilder()
+ .Append("filesystem:*.txt")
+ .Build())
+ .Build())
+ .Build())
+ .Build())
.Build();
ASSERT_TRUE(extension.get());
@@ -146,22 +151,26 @@ TEST_F(FileBrowserHandlerManifestTest, ValidFileBrowserHandlerMIMETypes) {
ExtensionBuilder()
.SetID(extension_misc::kQuickOfficeExtensionId)
.SetManifest(
- std::move(DictionaryBuilder()
- .Set("name", "file browser handler test")
- .Set("version", "1.0.0")
- .Set("manifest_version", 2)
- .Set("permissions",
- std::move(extensions::ListBuilder().Append(
- "fileBrowserHandler")))
- .Set("file_browser_handlers",
- std::move(ListBuilder().Append(std::move(
- DictionaryBuilder()
- .Set("id", "ID")
- .Set("default_title", "Default title")
- .Set("default_icon", "icon.png")
- .Set("file_filters",
- std::move(ListBuilder().Append(
- "filesystem:*.txt")))))))))
+ DictionaryBuilder()
+ .Set("name", "file browser handler test")
+ .Set("version", "1.0.0")
+ .Set("manifest_version", 2)
+ .Set("permissions", extensions::ListBuilder()
+ .Append("fileBrowserHandler")
+ .Build())
+ .Set("file_browser_handlers",
+ ListBuilder()
+ .Append(DictionaryBuilder()
+ .Set("id", "ID")
+ .Set("default_title", "Default title")
+ .Set("default_icon", "icon.png")
+ .Set("file_filters",
+ ListBuilder()
+ .Append("filesystem:*.txt")
+ .Build())
+ .Build())
+ .Build())
+ .Build())
.Build();
ASSERT_TRUE(extension.get());
@@ -181,25 +190,29 @@ TEST_F(FileBrowserHandlerManifestTest, ValidFileBrowserHandlerWithCreate) {
scoped_refptr<const Extension> extension =
ExtensionBuilder()
.SetManifest(
- std::move(DictionaryBuilder()
- .Set("name", "file browser handler test create")
- .Set("version", "1.0.0")
- .Set("manifest_version", 2)
- .Set("permissions",
- std::move(extensions::ListBuilder().Append(
- "fileBrowserHandler")))
- .Set("file_browser_handlers",
- std::move(ListBuilder().Append(std::move(
- DictionaryBuilder()
- .Set("id", "ID")
- .Set("default_title", "Default title")
- .Set("default_icon", "icon.png")
- .Set("file_filters",
- std::move(ListBuilder().Append(
- "filesystem:*.txt")))
- .Set("file_access",
- std::move(ListBuilder().Append(
- "create")))))))))
+ DictionaryBuilder()
+ .Set("name", "file browser handler test create")
+ .Set("version", "1.0.0")
+ .Set("manifest_version", 2)
+ .Set("permissions", extensions::ListBuilder()
+ .Append("fileBrowserHandler")
+ .Build())
+ .Set("file_browser_handlers",
+ ListBuilder()
+ .Append(
+ DictionaryBuilder()
+ .Set("id", "ID")
+ .Set("default_title", "Default title")
+ .Set("default_icon", "icon.png")
+ .Set("file_filters",
+ ListBuilder()
+ .Append("filesystem:*.txt")
+ .Build())
+ .Set("file_access",
+ ListBuilder().Append("create").Build())
+ .Build())
+ .Build())
+ .Build())
.Build();
ASSERT_TRUE(extension.get());
« chrome/browser/extensions/activity_log/activity_log_policy_unittest.cc ('K') | « chrome/common/extensions/api/extension_action/browser_action_manifest_unittest.cc ('k') | chrome/common/extensions/features/chrome_channel_feature_filter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698