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

chrome/browser/extensions/extension_context_menu_model_unittest.cc

 // Copyright (c) 2012 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/extension_context_menu_model.h"
 
 #include <utility>
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 142 matching lines @@
 
 const Extension* ExtensionContextMenuModelTest::AddExtensionWithHostPermission(
     const std::string& name,
     const char* action_key,
     Manifest::Location location,
     const std::string& host_permission) {
   DictionaryBuilder manifest;
   manifest.Set("name", name)
       .Set("version", "1")
       .Set("manifest_version", 2)
-      .Set(action_key, DictionaryBuilder());
+      .Set(action_key, DictionaryBuilder().Build());
   if (!host_permission.empty())
-    manifest.Set("permissions",
-                 std::move(ListBuilder().Append(host_permission)));
+    manifest.Set("permissions", ListBuilder().Append(host_permission).Build());
   scoped_refptr<const Extension> extension =
       ExtensionBuilder()
-          .SetManifest(std::move(manifest))
+          .SetManifest(manifest.Build())
           .SetID(crx_file::id_util::GenerateId(name))
           .SetLocation(location)
           .Build();
   if (!extension.get())
     ADD_FAILURE();
   service()->AddExtension(extension.get());
   return extension.get();
 }
 
 Browser* ExtensionContextMenuModelTest::GetBrowser() {
@@ skipping 47 matching lines @@
 // Tests the context menu for a component extension.
 TEST_F(ExtensionContextMenuModelTest, ComponentExtensionContextMenu) {
   InitializeEmptyExtensionService();
 
   std::string name("component");
   scoped_ptr<base::DictionaryValue> manifest =
       DictionaryBuilder()
           .Set("name", name)
           .Set("version", "1")
           .Set("manifest_version", 2)
-          .Set("browser_action", DictionaryBuilder())
+          .Set("browser_action", DictionaryBuilder().Build())
           .Build();
 
   {
     scoped_refptr<const Extension> extension =
         ExtensionBuilder()
             .SetManifest(make_scoped_ptr(manifest->DeepCopy()))
             .SetID(crx_file::id_util::GenerateId("component"))
             .SetLocation(Manifest::COMPONENT)
             .Build();
     service()->AddExtension(extension.get());
@@ skipping 404 matching lines @@
       "feature_disabled_extension", manifest_keys::kBrowserAction,
       Manifest::INTERNAL, "http://www.google.com/*");
   ExtensionContextMenuModel feature_disabled_menu(
       feature_disabled_extension, GetBrowser(),
       ExtensionContextMenuModel::VISIBLE, nullptr);
   EXPECT_EQ(-1, feature_disabled_menu.GetIndexOfCommandId(
                     ExtensionContextMenuModel::PAGE_ACCESS_SUBMENU));
 }
 
 }  // namespace extensions