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

chrome/browser/extensions/activity_log/activity_log_enabled_unittest.cc

 // Copyright 2013 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/run_loop.h"
 #include "chrome/browser/extensions/activity_log/activity_log.h"
 #include "chrome/browser/extensions/api/activity_log_private/activity_log_private_api.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/test_extension_system.h"
@@ skipping 131 matching lines @@
   // Allow Activity Log to install extension tracker.
   base::RunLoop().RunUntilIdle();
 
   EXPECT_EQ(0,
       profile1->GetPrefs()->GetInteger(prefs::kWatchdogExtensionActive));
   EXPECT_EQ(0,
       profile2->GetPrefs()->GetInteger(prefs::kWatchdogExtensionActive));
 
   scoped_refptr<Extension> extension =
       ExtensionBuilder()
-          .SetManifest(std::move(DictionaryBuilder()
-                                     .Set("name", "Watchdog Extension ")
-                                     .Set("version", "1.0.0")
-                                     .Set("manifest_version", 2)))
+          .SetManifest(DictionaryBuilder()
+                           .Set("name", "Watchdog Extension ")
+                           .Set("version", "1.0.0")
+                           .Set("manifest_version", 2)
+                           .Build())
           .SetID(kExtensionID)
           .Build();
   extension_service1->AddExtension(extension.get());
 
   EXPECT_EQ(1,
       profile1->GetPrefs()->GetInteger(prefs::kWatchdogExtensionActive));
   EXPECT_EQ(0,
       profile2->GetPrefs()->GetInteger(prefs::kWatchdogExtensionActive));
   EXPECT_TRUE(activity_log1->IsWatchdogAppActive());
   EXPECT_FALSE(activity_log2->IsWatchdogAppActive());
@@ skipping 33 matching lines @@
       profile1->GetPrefs()->GetInteger(prefs::kWatchdogExtensionActive));
   EXPECT_EQ(0,
       profile2->GetPrefs()->GetInteger(prefs::kWatchdogExtensionActive));
   EXPECT_FALSE(activity_log1->IsWatchdogAppActive());
   EXPECT_FALSE(activity_log2->IsWatchdogAppActive());
   EXPECT_FALSE(activity_log1->IsDatabaseEnabled());
   EXPECT_FALSE(activity_log2->IsDatabaseEnabled());
 
   scoped_refptr<Extension> extension2 =
       ExtensionBuilder()
-          .SetManifest(std::move(DictionaryBuilder()
-                                     .Set("name", "Watchdog Extension ")
-                                     .Set("version", "1.0.0")
-                                     .Set("manifest_version", 2)))
+          .SetManifest(DictionaryBuilder()
+                           .Set("name", "Watchdog Extension ")
+                           .Set("version", "1.0.0")
+                           .Set("manifest_version", 2)
+                           .Build())
           .SetID("fpofdchlamddhnajleknffcbmnjfahpg")
           .Build();
   extension_service1->AddExtension(extension.get());
   extension_service1->AddExtension(extension2.get());
   EXPECT_EQ(2,
       profile1->GetPrefs()->GetInteger(prefs::kWatchdogExtensionActive));
   EXPECT_TRUE(activity_log1->IsDatabaseEnabled());
   extension_service1->DisableExtension(kExtensionID,
                                        Extension::DISABLE_USER_ACTION);
   extension_service1->DisableExtension("fpofdchlamddhnajleknffcbmnjfahpg",
@@ skipping 25 matching lines @@
   base::RunLoop().RunUntilIdle();
 
   EXPECT_TRUE(activity_log->IsDatabaseEnabled());
   EXPECT_EQ(0,
       profile->GetPrefs()->GetInteger(prefs::kWatchdogExtensionActive));
   EXPECT_FALSE(activity_log->IsWatchdogAppActive());
 
   // Enable the extension.
   scoped_refptr<Extension> extension =
       ExtensionBuilder()
-          .SetManifest(std::move(DictionaryBuilder()
-                                     .Set("name", "Watchdog Extension ")
-                                     .Set("version", "1.0.0")
-                                     .Set("manifest_version", 2)))
+          .SetManifest(DictionaryBuilder()
+                           .Set("name", "Watchdog Extension ")
+                           .Set("version", "1.0.0")
+                           .Set("manifest_version", 2)
+                           .Build())
           .SetID(kExtensionID)
           .Build();
   extension_service->AddExtension(extension.get());
 
   EXPECT_TRUE(activity_log->IsDatabaseEnabled());
   EXPECT_EQ(1,
       profile->GetPrefs()->GetInteger(prefs::kWatchdogExtensionActive));
   EXPECT_TRUE(activity_log->IsWatchdogAppActive());
 
   extension_service->UninstallExtension(
       kExtensionID,
       extensions::UNINSTALL_REASON_FOR_TESTING,
       base::Bind(&base::DoNothing),
       NULL);
 
   EXPECT_TRUE(activity_log->IsDatabaseEnabled());
   EXPECT_EQ(0,
       profile->GetPrefs()->GetInteger(prefs::kWatchdogExtensionActive));
   EXPECT_FALSE(activity_log->IsWatchdogAppActive());
 
   // Cleanup.
   *base::CommandLine::ForCurrentProcess() = saved_cmdline_;
 }
 
 }  // namespace extensions