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

chrome/browser/metrics/extensions_metrics_provider_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/metrics/extensions_metrics_provider.h"
 
 #include <stdint.h>
 
 #include <string>
 
@@ skipping 32 matching lines @@
 
  protected:
   // Override the GetInstalledExtensions method to return a set of extensions
   // for tests.
   scoped_ptr<extensions::ExtensionSet> GetInstalledExtensions(
       Profile* profile) override {
     scoped_ptr<extensions::ExtensionSet> extensions(
         new extensions::ExtensionSet());
     scoped_refptr<const extensions::Extension> extension;
     extension = extensions::ExtensionBuilder()
-                    .SetManifest(std::move(extensions::DictionaryBuilder()
-                                               .Set("name", "Test extension")
-                                               .Set("version", "1.0.0")
-                                               .Set("manifest_version", 2)))
+                    .SetManifest(extensions::DictionaryBuilder()
+                                     .Set("name", "Test extension")
+                                     .Set("version", "1.0.0")
+                                     .Set("manifest_version", 2)
+                                     .Build())
                     .SetID("ahfgeienlihckogmohjhadlkjgocpleb")
                     .Build();
     extensions->Insert(extension);
     extension = extensions::ExtensionBuilder()
-                    .SetManifest(std::move(extensions::DictionaryBuilder()
-                                               .Set("name", "Test extension 2")
-                                               .Set("version", "1.0.0")
-                                               .Set("manifest_version", 2)))
+                    .SetManifest(extensions::DictionaryBuilder()
+                                     .Set("name", "Test extension 2")
+                                     .Set("version", "1.0.0")
+                                     .Set("manifest_version", 2)
+                                     .Build())
                     .SetID("pknkgggnfecklokoggaggchhaebkajji")
                     .Build();
     extensions->Insert(extension);
-    extension =
-        extensions::ExtensionBuilder()
-            .SetManifest(std::move(extensions::DictionaryBuilder()
-                                       .Set("name", "Colliding Extension")
-                                       .Set("version", "1.0.0")
-                                       .Set("manifest_version", 2)))
-            .SetID("mdhofdjgenpkhlmddfaegdjddcecipmo")
-            .Build();
+    extension = extensions::ExtensionBuilder()
+                    .SetManifest(extensions::DictionaryBuilder()
+                                     .Set("name", "Colliding Extension")
+                                     .Set("version", "1.0.0")
+                                     .Set("manifest_version", 2)
+                                     .Build())
+                    .SetID("mdhofdjgenpkhlmddfaegdjddcecipmo")
+                    .Build();
     extensions->Insert(extension);
     return extensions;
   }
 
   // Override GetClientID() to return a specific value on which test
   // expectations are based.
   uint64_t GetClientID() override { return 0x3f1bfee9; }
 };
 
 }  // namespace
@@ skipping 26 matching lines @@
           &local_state,
           base::Bind(&IsMetricsReportingEnabled),
           base::Bind(&StoreNoClientInfoBackup),
           base::Bind(&ReturnNoBackup)));
   TestExtensionsMetricsProvider extension_metrics(metrics_state_manager.get());
   extension_metrics.ProvideSystemProfileMetrics(&system_profile);
   ASSERT_EQ(2, system_profile.occupied_extension_bucket_size());
   EXPECT_EQ(10, system_profile.occupied_extension_bucket(0));
   EXPECT_EQ(1007, system_profile.occupied_extension_bucket(1));
 }