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

chrome/browser/extensions/extension_web_ui_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 "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "build/build_config.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_web_ui.h"
 #include "chrome/browser/extensions/extension_web_ui_override_registrar.h"
@@ skipping 59 matching lines @@
 
 // Test that component extension url overrides have lower priority than
 // non-component extension url overrides.
 TEST_F(ExtensionWebUITest, ExtensionURLOverride) {
   const char kOverrideResource[] = "1.html";
   // Register a non-component extension.
   DictionaryBuilder manifest;
   manifest.Set(manifest_keys::kName, "ext1")
       .Set(manifest_keys::kVersion, "0.1")
       .Set(std::string(manifest_keys::kChromeURLOverrides),
-           std::move(DictionaryBuilder().Set("bookmarks", kOverrideResource)));
+           DictionaryBuilder().Set("bookmarks", kOverrideResource).Build());
   scoped_refptr<Extension> ext_unpacked(
       ExtensionBuilder()
-          .SetManifest(std::move(manifest))
+          .SetManifest(manifest.Build())
           .SetLocation(Manifest::UNPACKED)
           .SetID("abcdefghijabcdefghijabcdefghijaa")
           .Build());
   extension_service_->AddExtension(ext_unpacked.get());
 
   const GURL kExpectedUnpackedOverrideUrl =
       ext_unpacked->GetResourceURL(kOverrideResource);
   const GURL kBookmarksUrl("chrome://bookmarks");
   GURL changed_url = kBookmarksUrl;
   EXPECT_TRUE(
@@ skipping 11 matching lines @@
   EXPECT_TRUE(ExtensionWebUI::HandleChromeURLOverrideReverse(&url_plus_fragment,
                                                              profile_.get()));
   EXPECT_EQ(kBookmarksUrl.Resolve("#1"), url_plus_fragment);
 
   // Register a component extension
   const char kOverrideResource2[] = "2.html";
   DictionaryBuilder manifest2;
   manifest2.Set(manifest_keys::kName, "ext2")
       .Set(manifest_keys::kVersion, "0.1")
       .Set(std::string(manifest_keys::kChromeURLOverrides),
-           std::move(DictionaryBuilder().Set("bookmarks", kOverrideResource2)));
+           DictionaryBuilder().Set("bookmarks", kOverrideResource2).Build());
   scoped_refptr<Extension> ext_component(
       ExtensionBuilder()
-          .SetManifest(std::move(manifest2))
+          .SetManifest(manifest2.Build())
           .SetLocation(Manifest::COMPONENT)
           .SetID("bbabcdefghijabcdefghijabcdefghij")
           .Build());
   extension_service_->AddComponentExtension(ext_component.get());
 
   // Despite being registered more recently, the component extension should
   // not take precedence over the non-component extension.
   changed_url = kBookmarksUrl;
   EXPECT_TRUE(
       ExtensionWebUI::HandleChromeURLOverride(&changed_url, profile_.get()));
@@ skipping 23 matching lines @@
   changed_url = kBookmarksUrl;
   EXPECT_TRUE(
       ExtensionWebUI::HandleChromeURLOverride(&changed_url, profile_.get()));
   EXPECT_EQ(kExpectedUnpackedOverrideUrl, changed_url);
   EXPECT_TRUE(ExtensionWebUI::HandleChromeURLOverrideReverse(&changed_url,
                                                              profile_.get()));
   EXPECT_EQ(kBookmarksUrl, changed_url);
 }
 
 }  // namespace extensions