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

chrome/browser/extensions/api/tabs/tabs_api_unittest.cc

 // Copyright 2016 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/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/api/tabs/tabs_api.h"
 #include "chrome/browser/extensions/extension_function_test_utils.h"
 #include "chrome/browser/extensions/extension_service_test_base.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 89 matching lines @@
   // An extension without "tabs" permission will see none of the 3 tabs.
   scoped_refptr<const Extension> extension = test_util::CreateEmptyExtension();
   scoped_ptr<base::ListValue> tabs_list_without_permission(
       RunTabsQueryFunction(browser(), extension.get(), kTitleAndURLQueryInfo));
   ASSERT_TRUE(tabs_list_without_permission);
   EXPECT_EQ(0u, tabs_list_without_permission->GetSize());
 
   // An extension with "tabs" permission however will see the third tab.
   scoped_refptr<const Extension> extension_with_permission =
       ExtensionBuilder()
-          .SetManifest(std::move(
+          .SetManifest(
               DictionaryBuilder()
                   .Set("name", "Extension with tabs permission")
                   .Set("version", "1.0")
                   .Set("manifest_version", 2)
-                  .Set("permissions", std::move(ListBuilder().Append("tabs")))))
+                  .Set("permissions", ListBuilder().Append("tabs").Build())
+                  .Build())
           .Build();
   scoped_ptr<base::ListValue> tabs_list_with_permission(RunTabsQueryFunction(
       browser(), extension_with_permission.get(), kTitleAndURLQueryInfo));
   ASSERT_TRUE(tabs_list_with_permission);
   ASSERT_EQ(1u, tabs_list_with_permission->GetSize());
 
   const base::DictionaryValue* third_tab_info;
   ASSERT_TRUE(tabs_list_with_permission->GetDictionary(0, &third_tab_info));
   int third_tab_id = -1;
   ASSERT_TRUE(third_tab_info->GetInteger("id", &third_tab_id));
@@ skipping 22 matching lines @@
         base::ASCIIToUTF16(tab_titles[i]));
   }
 
   const char* kTitleAndURLQueryInfo =
       "[{\"title\": \"Sample title\", \"url\": \"*://www.google.com/*\"}]";
 
   // An extension with "host" permission will only see the third tab.
   scoped_refptr<const Extension> extension_with_permission =
       ExtensionBuilder()
           .SetManifest(
-              std::move(DictionaryBuilder()
-                            .Set("name", "Extension with tabs permission")
-                            .Set("version", "1.0")
-                            .Set("manifest_version", 2)
-                            .Set("permissions", std::move(ListBuilder().Append(
-                                                    "*://www.google.com/*")))))
+              DictionaryBuilder()
+                  .Set("name", "Extension with tabs permission")
+                  .Set("version", "1.0")
+                  .Set("manifest_version", 2)
+                  .Set("permissions",
+                       ListBuilder().Append("*://www.google.com/*").Build())
+                  .Build())
           .Build();
 
   {
     scoped_ptr<base::ListValue> tabs_list_with_permission(RunTabsQueryFunction(
         browser(), extension_with_permission.get(), kTitleAndURLQueryInfo));
     ASSERT_TRUE(tabs_list_with_permission);
     ASSERT_EQ(1u, tabs_list_with_permission->GetSize());
 
     const base::DictionaryValue* third_tab_info;
     ASSERT_TRUE(tabs_list_with_permission->GetDictionary(0, &third_tab_info));
@@ skipping 23 matching lines @@
     ASSERT_TRUE(first_tab_info->GetInteger("id", &first_tab_id));
     EXPECT_TRUE(ContainsValue(expected_tabs_ids, first_tab_id));
 
     int third_tab_id = -1;
     ASSERT_TRUE(third_tab_info->GetInteger("id", &third_tab_id));
     EXPECT_TRUE(ContainsValue(expected_tabs_ids, third_tab_id));
   }
 }
 
 }  // namespace extensions