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

extensions/browser/mojo/keep_alive_impl_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 "extensions/browser/mojo/keep_alive_impl.h"
 
 #include <utility>
 
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 10 matching lines @@
  public:
   KeepAliveTest()
       : notification_service_(content::NotificationService::Create()) {}
   ~KeepAliveTest() override {}
 
   void SetUp() override {
     ExtensionsTest::SetUp();
     message_loop_.reset(new base::MessageLoop);
     extension_ =
         ExtensionBuilder()
-            .SetManifest(std::move(
+            .SetManifest(
                 DictionaryBuilder()
                     .Set("name", "app")
                     .Set("version", "1")
                     .Set("manifest_version", 2)
-                    .Set("app",
-                         std::move(DictionaryBuilder().Set(
-                             "background",
-                             std::move(DictionaryBuilder().Set(
-                                 "scripts", std::move(ListBuilder().Append(
-                                                "background.js")))))))))
+                    .Set("app", DictionaryBuilder()
+                                    .Set("background",
+                                         DictionaryBuilder()
+                                             .Set("scripts",
+                                                  ListBuilder()
+                                                      .Append("background.js")
+                                                      .Build())
+                                             .Build())
+                                    .Build())
+                    .Build())
             .SetID("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")
             .Build();
   }
 
   void TearDown() override {
     message_loop_.reset();
     ExtensionsTest::TearDown();
   }
 
   void WaitUntilLazyKeepAliveChanges() {
@@ skipping 51 matching lines @@
   EXPECT_EQ(0, GetKeepAliveCount());
 }
 
 TEST_F(KeepAliveTest, UnloadExtension) {
   mojo::InterfacePtr<KeepAlive> keep_alive;
   CreateKeepAlive(mojo::GetProxy(&keep_alive));
   EXPECT_EQ(1, GetKeepAliveCount());
 
   scoped_refptr<const Extension> other_extension =
       ExtensionBuilder()
-          .SetManifest(std::move(
+          .SetManifest(
               DictionaryBuilder()
                   .Set("name", "app")
                   .Set("version", "1")
                   .Set("manifest_version", 2)
-                  .Set("app", std::move(DictionaryBuilder().Set(
-                                  "background",
-                                  std::move(DictionaryBuilder().Set(
-                                      "scripts", std::move(ListBuilder().Append(
-                                                     "background.js")))))))))
+                  .Set("app",
+                       DictionaryBuilder()
+                           .Set("background",
+                                DictionaryBuilder()
+                                    .Set("scripts", ListBuilder()
+                                                        .Append("background.js")
+                                                        .Build())
+                                    .Build())
+                           .Build())
+                  .Build())
           .SetID("bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb")
           .Build();
 
   ExtensionRegistry::Get(browser_context())
       ->TriggerOnUnloaded(other_extension.get(),
                           UnloadedExtensionInfo::REASON_DISABLE);
   EXPECT_EQ(1, GetKeepAliveCount());
 
   ExtensionRegistry::Get(browser_context())
       ->TriggerOnUnloaded(extension(), UnloadedExtensionInfo::REASON_DISABLE);
@@ skipping 18 matching lines @@
   // ProcessManager and so the keep-alive count should remain unchanged.
   EXPECT_EQ(1, GetKeepAliveCount());
 
   // Wait for |keep_alive| to disconnect.
   base::RunLoop run_loop;
   keep_alive.set_connection_error_handler(run_loop.QuitClosure());
   run_loop.Run();
 }
 
 }  // namespace extensions