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

Unified Diff: chrome/browser/notifications/message_center_settings_controller_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
Index: chrome/browser/notifications/message_center_settings_controller_unittest.cc
diff --git a/chrome/browser/notifications/message_center_settings_controller_unittest.cc b/chrome/browser/notifications/message_center_settings_controller_unittest.cc
index 538c8455f4615e66332c84f8eb2252277224dbc8..a89a2a7a59509725e5592f38bf3ff14de40ddf1c 100644
--- a/chrome/browser/notifications/message_center_settings_controller_unittest.cc
+++ b/chrome/browser/notifications/message_center_settings_controller_unittest.cc
@@ -195,71 +195,84 @@ TEST_F(MessageCenterSettingsControllerTest, NotifierSortOrder) {
// Baf is a hosted app which should not appear in the notifier list.
const std::string kBafId = "dddddddddddddddddddddddddddddddd";
- foo_app.SetManifest(std::move(
+ foo_app.SetManifest(
extensions::DictionaryBuilder()
.Set("name", "Foo")
.Set("version", "1.0.0")
.Set("manifest_version", 2)
- .Set("app",
- std::move(extensions::DictionaryBuilder().Set(
- "background",
- std::move(extensions::DictionaryBuilder().Set(
- "scripts", std::move(extensions::ListBuilder().Append(
- "background.js")))))))
+ .Set("app", extensions::DictionaryBuilder()
+ .Set("background",
+ extensions::DictionaryBuilder()
+ .Set("scripts", extensions::ListBuilder()
+ .Append("background.js")
+ .Build())
+ .Build())
+ .Build())
.Set("permissions",
- std::move(extensions::ListBuilder().Append("notifications")))));
+ extensions::ListBuilder().Append("notifications").Build())
+ .Build());
foo_app.SetID(kFooId);
extension_service->AddExtension(foo_app.Build().get());
extensions::ExtensionBuilder bar_app;
- bar_app.SetManifest(std::move(
+ bar_app.SetManifest(
extensions::DictionaryBuilder()
.Set("name", "Bar")
.Set("version", "1.0.0")
.Set("manifest_version", 2)
- .Set("app",
- std::move(extensions::DictionaryBuilder().Set(
- "background",
- std::move(extensions::DictionaryBuilder().Set(
- "scripts", std::move(extensions::ListBuilder().Append(
- "background.js")))))))
+ .Set("app", extensions::DictionaryBuilder()
+ .Set("background",
+ extensions::DictionaryBuilder()
+ .Set("scripts", extensions::ListBuilder()
+ .Append("background.js")
+ .Build())
+ .Build())
+ .Build())
.Set("permissions",
- std::move(extensions::ListBuilder().Append("notifications")))));
+ extensions::ListBuilder().Append("notifications").Build())
+ .Build());
bar_app.SetID(kBarId);
extension_service->AddExtension(bar_app.Build().get());
extensions::ExtensionBuilder baz_app;
- baz_app.SetManifest(std::move(
+ baz_app.SetManifest(
extensions::DictionaryBuilder()
.Set("name", "baz")
.Set("version", "1.0.0")
.Set("manifest_version", 2)
- .Set("app",
- std::move(extensions::DictionaryBuilder().Set(
- "background",
- std::move(extensions::DictionaryBuilder().Set(
- "scripts", std::move(extensions::ListBuilder().Append(
- "background.js")))))))));
+ .Set("app", extensions::DictionaryBuilder()
+ .Set("background",
+ extensions::DictionaryBuilder()
+ .Set("scripts", extensions::ListBuilder()
+ .Append("background.js")
+ .Build())
+ .Build())
+ .Build())
+ .Build());
baz_app.SetID(kBazId);
extension_service->AddExtension(baz_app.Build().get());
extensions::ExtensionBuilder baf_app;
- baf_app.SetManifest(std::move(
+ baf_app.SetManifest(
extensions::DictionaryBuilder()
.Set("name", "baf")
.Set("version", "1.0.0")
.Set("manifest_version", 2)
.Set("app",
- std::move(extensions::DictionaryBuilder().Set(
- "urls",
- std::move(extensions::ListBuilder().Append(
- "http://localhost/extensions/hosted_app/main.html")))))
- .Set(
- "launch",
- std::move(extensions::DictionaryBuilder().Set(
- "urls",
- std::move(extensions::ListBuilder().Append(
- "http://localhost/extensions/hosted_app/main.html")))))));
+ extensions::DictionaryBuilder()
+ .Set("urls", extensions::ListBuilder()
+ .Append("http://localhost/extensions/"
+ "hosted_app/main.html")
+ .Build())
+ .Build())
+ .Set("launch",
+ extensions::DictionaryBuilder()
+ .Set("urls", extensions::ListBuilder()
+ .Append("http://localhost/extensions/"
+ "hosted_app/main.html")
+ .Build())
+ .Build())
+ .Build());
baf_app.SetID(kBafId);
extension_service->AddExtension(baf_app.Build().get());

Powered by Google App Engine
This is Rietveld 408576698