Index: chrome/common/extensions/api/extension_action/browser_action_manifest_unittest.cc |
diff --git a/chrome/common/extensions/api/extension_action/browser_action_manifest_unittest.cc b/chrome/common/extensions/api/extension_action/browser_action_manifest_unittest.cc |
index fdab935d0ae78107e499fa81e58c935ba1787d92..516905ba3725436228dc008e1f24fef6d5c3404c 100644 |
--- a/chrome/common/extensions/api/extension_action/browser_action_manifest_unittest.cc |
+++ b/chrome/common/extensions/api/extension_action/browser_action_manifest_unittest.cc |
@@ -27,13 +27,15 @@ TEST_F(BrowserActionManifestTest, |
BrowserActionManifestIcons_NoDefaultIcons) { |
scoped_refptr<const Extension> extension = |
ExtensionBuilder() |
- .SetManifest(std::move( |
+ .SetManifest( |
DictionaryBuilder() |
.Set("name", "No default properties") |
.Set("version", "1.0.0") |
.Set("manifest_version", 2) |
- .Set("browser_action", std::move(DictionaryBuilder().Set( |
- "default_title", "Title"))))) |
+ .Set( |
+ "browser_action", |
+ DictionaryBuilder().Set("default_title", "Title").Build()) |
+ .Build()) |
.Build(); |
ASSERT_TRUE(extension.get()); |
@@ -47,13 +49,15 @@ TEST_F(BrowserActionManifestTest, |
BrowserActionManifestIcons_StringDefaultIcon) { |
scoped_refptr<const Extension> extension = |
ExtensionBuilder() |
- .SetManifest(std::move( |
+ .SetManifest( |
DictionaryBuilder() |
.Set("name", "String default icon") |
.Set("version", "1.0.0") |
.Set("manifest_version", 2) |
- .Set("browser_action", std::move(DictionaryBuilder().Set( |
- "default_icon", "icon.png"))))) |
+ .Set("browser_action", DictionaryBuilder() |
+ .Set("default_icon", "icon.png") |
+ .Build()) |
+ .Build()) |
.Build(); |
ASSERT_TRUE(extension.get()); |
@@ -74,18 +78,20 @@ TEST_F(BrowserActionManifestTest, |
// Arbitrary sizes should be allowed (useful for various scale factors). |
scoped_refptr<const Extension> extension = |
ExtensionBuilder() |
- .SetManifest(std::move( |
+ .SetManifest( |
DictionaryBuilder() |
.Set("name", "Dictionary default icon") |
.Set("version", "1.0.0") |
.Set("manifest_version", 2) |
.Set("browser_action", |
- std::move(DictionaryBuilder().Set( |
- "default_icon", |
- std::move(DictionaryBuilder() |
- .Set("19", "icon19.png") |
- .Set("24", "icon24.png") |
- .Set("38", "icon38.png"))))))) |
+ DictionaryBuilder() |
+ .Set("default_icon", DictionaryBuilder() |
+ .Set("19", "icon19.png") |
+ .Set("24", "icon24.png") |
+ .Set("38", "icon38.png") |
+ .Build()) |
+ .Build()) |
+ .Build()) |
.Build(); |
ASSERT_TRUE(extension.get()); |
@@ -111,12 +117,14 @@ TEST_F(BrowserActionManifestTest, |
.Set("version", "1.0.0") |
.Set("manifest_version", 2) |
.Set("browser_action", |
- std::move(DictionaryBuilder().Set( |
- "default_icon", |
- std::move(DictionaryBuilder() |
- .Set("19", std::string()) // Invalid value. |
- .Set("24", "icon24.png") |
- .Set("38", "icon38.png"))))) |
+ DictionaryBuilder() |
+ .Set("default_icon", |
+ DictionaryBuilder() |
+ .Set("19", std::string()) // Invalid value. |
+ .Set("24", "icon24.png") |
+ .Set("38", "icon38.png") |
+ .Build()) |
+ .Build()) |
.Build(); |
base::string16 error = ErrorUtils::FormatErrorMessageUTF16( |