Remove raw DictionaryValue::Set in //chrome

chrome/common/extensions/manifest_unittest.cc

 // Copyright (c) 2012 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 "extensions/common/manifest.h"
 
 #include <algorithm>
 #include <memory>
 #include <set>
 #include <string>
 #include <utility>
 
+#include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "extensions/common/error_utils.h"
 #include "extensions/common/features/feature.h"
 #include "extensions/common/features/simple_feature.h"
 #include "extensions/common/install_warning.h"
 #include "extensions/common/manifest_constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace extensions {
@@ skipping 17 matching lines @@
     EXPECT_EQ(type == Manifest::TYPE_HOSTED_APP, manifest->is_hosted_app());
     EXPECT_EQ(type == Manifest::TYPE_SHARED_MODULE,
               manifest->is_shared_module());
   }
 
   // Helper function that replaces the Manifest held by |manifest| with a copy
   // with its |key| changed to |value|. If |value| is NULL, then |key| will
   // instead be deleted.
   void MutateManifest(std::unique_ptr<Manifest>* manifest,
                       const std::string& key,
-                      base::Value* value) {
-    std::unique_ptr<base::DictionaryValue> manifest_value(
-        manifest->get()->value()->DeepCopy());
+                      std::unique_ptr<base::Value> value) {
+    auto manifest_value =
+        base::MakeUnique<base::DictionaryValue>(*manifest->get()->value());
     if (value)
-      manifest_value->Set(key, value);
+      manifest_value->Set(key, std::move(value));
     else
       manifest_value->Remove(key, NULL);
     manifest->reset(
         new Manifest(Manifest::INTERNAL, std::move(manifest_value)));
   }
 
   std::string default_value_;
 };
 
 // Verifies that extensions can access the correct keys.
@@ skipping 20 matching lines @@
   EXPECT_TRUE(manifest->GetString(keys::kBackgroundPageLegacy, &value));
   EXPECT_EQ("bg.html", value);
 
   // The unknown key 'unknown_key' should be accesible.
   value.clear();
   EXPECT_TRUE(manifest->GetString("unknown_key", &value));
   EXPECT_EQ("foo", value);
 
   // Set the manifest_version to 2; background_page should stop working.
   value.clear();
-  MutateManifest(&manifest, keys::kManifestVersion, new base::Value(2));
+  MutateManifest(&manifest, keys::kManifestVersion,
+                 base::MakeUnique<base::Value>(2));
   EXPECT_FALSE(manifest->GetString("background_page", &value));
   EXPECT_EQ("", value);
 
   // Validate should also give a warning.
   warnings.clear();
   EXPECT_TRUE(manifest->ValidateManifest(&error, &warnings));
   EXPECT_TRUE(error.empty());
   ASSERT_EQ(2u, warnings.size());
   {
     SimpleFeature feature;
     feature.set_name("background_page");
     feature.set_max_manifest_version(1);
     EXPECT_EQ(
         "'background_page' requires manifest version of 1 or lower.",
         warnings[0].message);
   }
 
   // Test DeepCopy and Equals.
   std::unique_ptr<Manifest> manifest2(manifest->DeepCopy());
   EXPECT_TRUE(manifest->Equals(manifest2.get()));
   EXPECT_TRUE(manifest2->Equals(manifest.get()));
-  MutateManifest(&manifest, "foo", new base::Value("blah"));
+  MutateManifest(&manifest, "foo", base::MakeUnique<base::Value>("blah"));
   EXPECT_FALSE(manifest->Equals(manifest2.get()));
 }
 
 // Verifies that key restriction based on type works.
 TEST_F(ManifestUnitTest, ExtensionTypes) {
   std::unique_ptr<base::DictionaryValue> value(new base::DictionaryValue());
   value->SetString(keys::kName, "extension");
   value->SetString(keys::kVersion, "1");
 
   std::unique_ptr<Manifest> manifest(
       new Manifest(Manifest::INTERNAL, std::move(value)));
   std::string error;
   std::vector<InstallWarning> warnings;
   EXPECT_TRUE(manifest->ValidateManifest(&error, &warnings));
   EXPECT_TRUE(error.empty());
   EXPECT_TRUE(warnings.empty());
 
   // By default, the type is Extension.
   AssertType(manifest.get(), Manifest::TYPE_EXTENSION);
 
   // Theme.
-  MutateManifest(
-      &manifest, keys::kTheme, new base::DictionaryValue());
+  MutateManifest(&manifest, keys::kTheme,
+                 base::MakeUnique<base::DictionaryValue>());
   AssertType(manifest.get(), Manifest::TYPE_THEME);
   MutateManifest(
       &manifest, keys::kTheme, NULL);
 
   // Shared module.
-  MutateManifest(
-      &manifest, keys::kExport, new base::DictionaryValue());
+  MutateManifest(&manifest, keys::kExport,
+                 base::MakeUnique<base::DictionaryValue>());
   AssertType(manifest.get(), Manifest::TYPE_SHARED_MODULE);
   MutateManifest(
       &manifest, keys::kExport, NULL);
 
   // Packaged app.
-  MutateManifest(
-      &manifest, keys::kApp, new base::DictionaryValue());
+  MutateManifest(&manifest, keys::kApp,
+                 base::MakeUnique<base::DictionaryValue>());
   AssertType(manifest.get(), Manifest::TYPE_LEGACY_PACKAGED_APP);
 
   // Platform app with event page.
-  MutateManifest(
-      &manifest, keys::kPlatformAppBackground, new base::DictionaryValue());
+  MutateManifest(&manifest, keys::kPlatformAppBackground,
+                 base::MakeUnique<base::DictionaryValue>());
   AssertType(manifest.get(), Manifest::TYPE_PLATFORM_APP);
   MutateManifest(
       &manifest, keys::kPlatformAppBackground, NULL);
 
   // Hosted app.
-  MutateManifest(
-      &manifest, keys::kWebURLs, new base::ListValue());
+  MutateManifest(&manifest, keys::kWebURLs,
+                 base::MakeUnique<base::ListValue>());
   AssertType(manifest.get(), Manifest::TYPE_HOSTED_APP);
   MutateManifest(
       &manifest, keys::kWebURLs, NULL);
-  MutateManifest(&manifest, keys::kLaunchWebURL, new base::Value("foo"));
+  MutateManifest(&manifest, keys::kLaunchWebURL,
+                 base::MakeUnique<base::Value>("foo"));
   AssertType(manifest.get(), Manifest::TYPE_HOSTED_APP);
   MutateManifest(
       &manifest, keys::kLaunchWebURL, NULL);
 }
 
 // Verifies that the getters filter restricted keys.
 TEST_F(ManifestUnitTest, RestrictedKeys) {
   std::unique_ptr<base::DictionaryValue> value(new base::DictionaryValue());
   value->SetString(keys::kName, "extension");
   value->SetString(keys::kVersion, "1");
 
   std::unique_ptr<Manifest> manifest(
       new Manifest(Manifest::INTERNAL, std::move(value)));
   std::string error;
   std::vector<InstallWarning> warnings;
   EXPECT_TRUE(manifest->ValidateManifest(&error, &warnings));
   EXPECT_TRUE(error.empty());
   EXPECT_TRUE(warnings.empty());
 
   // "Commands" requires manifest version 2.
   const base::Value* output = NULL;
-  MutateManifest(
-      &manifest, keys::kCommands, new base::DictionaryValue());
+  MutateManifest(&manifest, keys::kCommands,
+                 base::MakeUnique<base::DictionaryValue>());
   EXPECT_FALSE(manifest->HasKey(keys::kCommands));
   EXPECT_FALSE(manifest->Get(keys::kCommands, &output));
 
-  MutateManifest(&manifest, keys::kManifestVersion, new base::Value(2));
+  MutateManifest(&manifest, keys::kManifestVersion,
+                 base::MakeUnique<base::Value>(2));
   EXPECT_TRUE(manifest->HasKey(keys::kCommands));
   EXPECT_TRUE(manifest->Get(keys::kCommands, &output));
 
-  MutateManifest(
-      &manifest, keys::kPageAction, new base::DictionaryValue());
+  MutateManifest(&manifest, keys::kPageAction,
+                 base::MakeUnique<base::DictionaryValue>());
   AssertType(manifest.get(), Manifest::TYPE_EXTENSION);
   EXPECT_TRUE(manifest->HasKey(keys::kPageAction));
   EXPECT_TRUE(manifest->Get(keys::kPageAction, &output));
 
   // Platform apps cannot have a "page_action" key.
-  MutateManifest(
-      &manifest, keys::kPlatformAppBackground, new base::DictionaryValue());
+  MutateManifest(&manifest, keys::kPlatformAppBackground,
+                 base::MakeUnique<base::DictionaryValue>());
   AssertType(manifest.get(), Manifest::TYPE_PLATFORM_APP);
   EXPECT_FALSE(manifest->HasKey(keys::kPageAction));
   EXPECT_FALSE(manifest->Get(keys::kPageAction, &output));
   MutateManifest(
       &manifest, keys::kPlatformAppBackground, NULL);
 
   // Platform apps also can't have a "Commands" key.
   EXPECT_FALSE(manifest->HasKey(keys::kCommands));
   EXPECT_FALSE(manifest->Get(keys::kCommands, &output));
 }
 
 }  // namespace extensions