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

chrome/browser/extensions/permission_messages_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 <stddef.h>
 
 #include <utility>
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 35 matching lines @@
 // problematic functionality. These tests are prefixed with AntiTest_ and will
 // be changed as the correct behaviour is implemented. TODOs in the test explain
 // the currently problematic behaviour.
 class PermissionMessagesUnittest : public testing::Test {
  public:
   PermissionMessagesUnittest()
       : message_provider_(new ChromePermissionMessageProvider()) {}
   ~PermissionMessagesUnittest() override {}
 
  protected:
-  void CreateAndInstallAppWithPermissions(ListBuilder required_permissions,
-                                          ListBuilder optional_permissions) {
-    app_ = test_util::BuildApp(ExtensionBuilder())
-               .MergeManifest(
-                   DictionaryBuilder()
-                       .Set("permissions", std::move(required_permissions))
-                       .Set("optional_permissions",
-                            std::move(optional_permissions)))
-               .SetID(crx_file::id_util::GenerateId("app"))
-               .SetLocation(Manifest::INTERNAL)
-               .Build();
-    env_.GetExtensionService()->AddExtension(app_.get());
-  }
-
   void CreateAndInstallExtensionWithPermissions(
-      ListBuilder required_permissions,
-      ListBuilder optional_permissions) {
+      scoped_ptr<base::ListValue> required_permissions,
+      scoped_ptr<base::ListValue> optional_permissions) {
     app_ = test_util::BuildExtension(ExtensionBuilder())
                .MergeManifest(
                    DictionaryBuilder()
                        .Set("permissions", std::move(required_permissions))
                        .Set("optional_permissions",
-                            std::move(optional_permissions)))
+                            std::move(optional_permissions))
+                       .Build())
                .SetID(crx_file::id_util::GenerateId("extension"))
                .SetLocation(Manifest::INTERNAL)
                .Build();
     env_.GetExtensionService()->AddExtension(app_.get());
   }
 
   // Returns the permission messages that would display in the prompt that
   // requests all the optional permissions for the current |app_|.
   std::vector<base::string16> GetOptionalPermissionMessages() {
     scoped_ptr<const PermissionSet> granted_permissions =
@@ skipping 40 matching lines @@
   scoped_ptr<ChromePermissionMessageProvider> message_provider_;
   scoped_refptr<const Extension> app_;
 
   DISALLOW_COPY_AND_ASSIGN(PermissionMessagesUnittest);
 };
 
 // If an app has both the 'history' and 'tabs' permission, one should hide the
 // other (the 'history' permission has superset permissions).
 TEST_F(PermissionMessagesUnittest, HistoryHidesTabsMessage) {
   CreateAndInstallExtensionWithPermissions(
-      std::move(ListBuilder().Append("tabs").Append("history")), ListBuilder());
+      ListBuilder().Append("tabs").Append("history").Build(),
+      ListBuilder().Build());
 
   ASSERT_EQ(1U, required_permissions().size());
   EXPECT_EQ(
       l10n_util::GetStringUTF16(IDS_EXTENSION_PROMPT_WARNING_HISTORY_WRITE),
       required_permissions()[0]);
 
   ASSERT_EQ(0U, optional_permissions().size());
 }
 
 // If an app requests the 'history' permission, but already has the 'tabs'
 // permission, only the new coalesced message is displayed.
 TEST_F(PermissionMessagesUnittest, MixedPermissionMessagesCoalesceOnceGranted) {
   CreateAndInstallExtensionWithPermissions(
-      std::move(ListBuilder().Append("tabs")),
-      std::move(ListBuilder().Append("history")));
+      ListBuilder().Append("tabs").Build(),
+      ListBuilder().Append("history").Build());
 
   ASSERT_EQ(1U, required_permissions().size());
   EXPECT_EQ(
       l10n_util::GetStringUTF16(IDS_EXTENSION_PROMPT_WARNING_HISTORY_READ),
       required_permissions()[0]);
 
   ASSERT_EQ(1U, optional_permissions().size());
   EXPECT_EQ(
       l10n_util::GetStringUTF16(IDS_EXTENSION_PROMPT_WARNING_HISTORY_WRITE),
       optional_permissions()[0]);
@@ skipping 17 matching lines @@
 }
 
 // AntiTest: This behavior should be changed and improved.
 // If an app requests the 'tabs' permission but already has the 'history'
 // permission, a prompt is displayed. However, no prompt should appear at all,
 // since 'tabs' is a subset of 'history' and the final list of permissions are
 // not affected by this grant.
 TEST_F(PermissionMessagesUnittest,
        AntiTest_PromptCanRequestSubsetOfAlreadyGrantedPermissions) {
   CreateAndInstallExtensionWithPermissions(
-      std::move(ListBuilder().Append("history")),
-      std::move(ListBuilder().Append("tabs")));
+      ListBuilder().Append("history").Build(),
+      ListBuilder().Append("tabs").Build());
 
   ASSERT_EQ(1U, required_permissions().size());
   EXPECT_EQ(
       l10n_util::GetStringUTF16(IDS_EXTENSION_PROMPT_WARNING_HISTORY_WRITE),
       required_permissions()[0]);
 
   ASSERT_EQ(1U, optional_permissions().size());
   EXPECT_EQ(
       l10n_util::GetStringUTF16(IDS_EXTENSION_PROMPT_WARNING_HISTORY_READ),
       optional_permissions()[0]);
@@ skipping 19 matching lines @@
 }
 
 // AntiTest: This behavior should be changed and improved.
 // If an app requests the 'sessions' permission, nothing is displayed in the
 // permission request prompt. However, the required permissions for the app are
 // actually modified, so the prompt *should* display a message to prevent this
 // permission from being granted for free.
 TEST_F(PermissionMessagesUnittest,
        AntiTest_PromptCanBeEmptyButCausesChangeInPermissions) {
   CreateAndInstallExtensionWithPermissions(
-      std::move(ListBuilder().Append("tabs")),
-      std::move(ListBuilder().Append("sessions")));
+      ListBuilder().Append("tabs").Build(),
+      ListBuilder().Append("sessions").Build());
 
   ASSERT_EQ(1U, required_permissions().size());
   EXPECT_EQ(
       l10n_util::GetStringUTF16(IDS_EXTENSION_PROMPT_WARNING_HISTORY_READ),
       required_permissions()[0]);
 
   ASSERT_EQ(0U, optional_permissions().size());
 
   ASSERT_EQ(1U, active_permissions().size());
   EXPECT_EQ(
@@ skipping 108 matching lines @@
   ASSERT_EQ(1U, messages.size());
   EXPECT_EQ(base::ASCIIToUTF16(kMessage), messages.front().message());
   const std::vector<base::string16>& submessages =
       messages.front().submessages();
   ASSERT_EQ(arraysize(kDetails), submessages.size());
   for (size_t i = 0; i < submessages.size(); i++)
     EXPECT_EQ(base::ASCIIToUTF16(kDetails[i]), submessages[i]);
 }
 
 }  // namespace extensions