Make extensions::DictionaryBuilder and extensions::ListValue unmovable.

chrome/browser/extensions/shared_module_service_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/shared_module_service.h"
 
 #include <utility>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 20 matching lines @@
 // |import_id|.
 scoped_refptr<Extension> CreateExtensionImportingModule(
     const std::string& import_id,
     const std::string& id,
     const std::string& version) {
   DictionaryBuilder builder;
   builder.Set("name", "Has Dependent Modules")
          .Set("version", version)
          .Set("manifest_version", 2);
   if (!import_id.empty()) {
-    builder.Set("import", std::move(ListBuilder().Append(std::move(
-                              DictionaryBuilder().Set("id", import_id)))));
+    builder.Set("import",
+                ListBuilder()
+                    .Append(DictionaryBuilder().Set("id", import_id).Build())
+                    .Build());
   }
   scoped_ptr<base::DictionaryValue> manifest = builder.Build();
 
   return ExtensionBuilder()
       .SetManifest(std::move(manifest))
       .AddFlags(Extension::FROM_WEBSTORE)
       .SetID(id)
       .Build();
 }
 
@@ skipping 71 matching lines @@
 }
 
 TEST_F(SharedModuleServiceUnitTest, PruneSharedModulesOnUninstall) {
   // Create a module which exports a resource, and install it.
   scoped_ptr<base::DictionaryValue> manifest =
       DictionaryBuilder()
           .Set("name", "Shared Module")
           .Set("version", "1.0")
           .Set("manifest_version", 2)
           .Set("export",
-               std::move(DictionaryBuilder().Set(
-                   "resources", std::move(ListBuilder().Append("foo.js")))))
+               DictionaryBuilder()
+                   .Set("resources", ListBuilder().Append("foo.js").Build())
+                   .Build())
           .Build();
   scoped_refptr<Extension> shared_module =
       ExtensionBuilder()
           .SetManifest(std::move(manifest))
           .AddFlags(Extension::FROM_WEBSTORE)
           .SetID(crx_file::id_util::GenerateId("shared_module"))
           .Build();
 
   EXPECT_TRUE(InstallExtension(shared_module.get(), false));
 
@@ skipping 19 matching lines @@
 }
 
 TEST_F(SharedModuleServiceUnitTest, PruneSharedModulesOnUpdate) {
   // Create two modules which export a resource, and install them.
   scoped_ptr<base::DictionaryValue> manifest_1 =
       DictionaryBuilder()
           .Set("name", "Shared Module 1")
           .Set("version", "1.0")
           .Set("manifest_version", 2)
           .Set("export",
-               std::move(DictionaryBuilder().Set(
-                   "resources", std::move(ListBuilder().Append("foo.js")))))
+               DictionaryBuilder()
+                   .Set("resources", ListBuilder().Append("foo.js").Build())
+                   .Build())
           .Build();
   scoped_refptr<Extension> shared_module_1 =
       ExtensionBuilder()
           .SetManifest(std::move(manifest_1))
           .AddFlags(Extension::FROM_WEBSTORE)
           .SetID(crx_file::id_util::GenerateId("shared_module_1"))
           .Build();
   EXPECT_TRUE(InstallExtension(shared_module_1.get(), false));
 
   scoped_ptr<base::DictionaryValue> manifest_2 =
       DictionaryBuilder()
           .Set("name", "Shared Module 2")
           .Set("version", "1.0")
           .Set("manifest_version", 2)
           .Set("export",
-               std::move(DictionaryBuilder().Set(
-                   "resources", std::move(ListBuilder().Append("foo.js")))))
+               DictionaryBuilder()
+                   .Set("resources", ListBuilder().Append("foo.js").Build())
+                   .Build())
           .Build();
   scoped_refptr<Extension> shared_module_2 =
       ExtensionBuilder()
           .SetManifest(std::move(manifest_2))
           .AddFlags(Extension::FROM_WEBSTORE)
           .SetID(crx_file::id_util::GenerateId("shared_module_2"))
           .Build();
   EXPECT_TRUE(InstallExtension(shared_module_2.get(), false));
 
   std::string extension_id = crx_file::id_util::GenerateId("extension_id");
@@ skipping 39 matching lines @@
   std::string whitelisted_id = crx_file::id_util::GenerateId("whitelisted");
   std::string nonwhitelisted_id =
       crx_file::id_util::GenerateId("nonwhitelisted");
   // Create a module which exports to a restricted whitelist.
   scoped_ptr<base::DictionaryValue> manifest =
       DictionaryBuilder()
           .Set("name", "Shared Module")
           .Set("version", "1.0")
           .Set("manifest_version", 2)
           .Set("export",
-               std::move(
-                   DictionaryBuilder()
-                       .Set("whitelist",
-                            std::move(ListBuilder().Append(whitelisted_id)))
-                       .Set("resources", std::move(ListBuilder().Append("*")))))
+               DictionaryBuilder()
+                   .Set("whitelist",
+                        ListBuilder().Append(whitelisted_id).Build())
+                   .Set("resources", ListBuilder().Append("*").Build())
+                   .Build())
           .Build();
   scoped_refptr<Extension> shared_module =
       ExtensionBuilder()
           .SetManifest(std::move(manifest))
           .AddFlags(Extension::FROM_WEBSTORE)
           .SetID(crx_file::id_util::GenerateId("shared_module"))
           .Build();
 
   EXPECT_TRUE(InstallExtension(shared_module.get(), false));
 
@@ skipping 10 matching lines @@
                                      nonwhitelisted_id,
                                      "1.0");
   // This should succeed because only CRX installer (and by extension the
   // WebStore Installer) checks the shared module whitelist.  InstallExtension
   // bypasses the whitelist check because the SharedModuleService does not
   // care about whitelists.
   EXPECT_TRUE(InstallExtension(nonwhitelisted_extension.get(), false));
 }
 
 }  // namespace extensions