Changed from base::Value to base::Value::Dict in MakeExtension

This is part of Code Health to change base::DictionaryValue to base::Value::Dict for a few UTs.

As a side effect, this change will also force the change from base::Value to base::Value::Dict in test_environment MakeExtension and all subsequent call sites.


Bug: 1187061
Change-Id: Ic122c85393299a3ee9449aed896d1af4b2168c7b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4118895
Reviewed-by: Dominick Ng <[email protected]>
Reviewed-by: Avi Drissman <[email protected]>
Commit-Queue: David Yeung <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1085722}

Author: dayeung1

apps/saved_files_service_unittest.cc

@@ -50,7 +50,7 @@ class SavedFilesServiceUnitTest : public testing::Test {
         "  ]"
         "}";
     testing::Test::SetUp();
-    extension_ = env_.MakeExtension(base::test::ParseJson(kManifest));
+    extension_ = env_.MakeExtension(base::test::ParseJsonDict(kManifest));
     service_ = SavedFilesService::Get(env_.profile());
     path_ = base::FilePath(FILE_PATH_LITERAL("filename.ext"));
   }
@@ -152,7 +152,7 @@ TEST_F(SavedFilesServiceUnitTest, NoRetainEntriesPermissionTest) {
   static const char kManifest[] =
       "{\"app\": {\"background\": {\"scripts\": [\"background.js\"]}},"
       "\"permissions\": [\"fileSystem\"]}";
-  extension_ = env_.MakeExtension(base::test::ParseJson(kManifest));
+  extension_ = env_.MakeExtension(base::test::ParseJsonDict(kManifest));
   service_->RegisterFileEntry(extension_->id(), GenerateId(1), path_, true);
   TRACE_CALL(CheckEntrySequenceNumber(1, 0));
   SavedFileEntry entry;

chrome/browser/extensions/api/declarative/rules_registry_with_cache_unittest.cc

@@ -55,16 +55,16 @@ class RulesRegistryWithCacheTest : public testing::Test {
   void SetUp() override {
     // Note that env_.MakeExtension below also forces the creation of
     // ExtensionService.
-    base::DictionaryValue manifest_extra;
+    base::Value::Dict manifest_extra;
     std::string key;
     CHECK(Extension::ProducePEM("test extension 1", &key));
-    manifest_extra.SetStringKey(manifest_keys::kPublicKey, key);
+    manifest_extra.Set(manifest_keys::kPublicKey, key);
     extension1_ = env_.MakeExtension(manifest_extra);
     CHECK(extension1_.get());
 
     // Different "key" values for the two extensions ensure a different ID.
     CHECK(Extension::ProducePEM("test extension 2", &key));
-    manifest_extra.SetStringKey(manifest_keys::kPublicKey, key);
+    manifest_extra.Set(manifest_keys::kPublicKey, key);
     extension2_ = env_.MakeExtension(manifest_extra);
     CHECK(extension2_.get());
     CHECK_NE(extension2_->id(), extension1_->id());

chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry_unittest.cc

@@ -187,7 +187,7 @@ TEST_F(DeclarativeChromeContentRulesRegistryTest, ActiveRulesDoesntGrow) {
   std::vector<const api::events::Rule*> rules({&rule});
 
   const Extension* extension =
-      env()->MakeExtension(base::test::ParseJson("{\"page_action\": {}}"));
+      env()->MakeExtension(base::test::ParseJsonDict("{\"page_action\": {}}"));
   registry->AddRulesImpl(extension->id(), rules);
 
   registry->DidFinishNavigation(tab.get(), &navigation_handle);

chrome/browser/extensions/api/declarative_content/content_action_unittest.cc

@@ -37,6 +37,7 @@ namespace extensions {
 namespace {
 
 using base::test::ParseJson;
+using base::test::ParseJsonDict;
 using testing::HasSubstr;
 using ContentActionType = declarative_content_constants::ContentActionType;
 using extensions::mojom::ManifestLocation;
@@ -264,7 +265,7 @@ TEST(DeclarativeContentActionTest, SetIcon) {
     base::Value::Dict dict = builder.BuildDict();
 
     const Extension* extension = env.MakeExtension(
-        ParseJson(R"({"page_action": {"default_title": "Extension"}})"));
+        ParseJsonDict(R"({"page_action": {"default_title": "Extension"}})"));
     base::HistogramTester histogram_tester;
     TestingProfile profile;
     std::string error;
@@ -322,7 +323,7 @@ TEST(DeclarativeContentActionTest, SetInvisibleIcon) {
 
   // Expect an error and no instance to be created.
   const Extension* extension = env.MakeExtension(
-      ParseJson(R"({"page_action": {"default_title": "Extension"}})"));
+      ParseJsonDict(R"({"page_action": {"default_title": "Extension"}})"));
   base::HistogramTester histogram_tester;
   TestingProfile profile;
   std::string error;

chrome/browser/extensions/api/device_permissions_manager_unittest.cc

@@ -45,14 +45,14 @@ class DevicePermissionsManagerTest : public testing::Test {
     testing::Test::SetUp();
     env_ = std::make_unique<extensions::TestExtensionEnvironment>();
     extension_ = env_->MakeExtension(
-        base::test::ParseJson("{"
-                              "  \"app\": {"
-                              "    \"background\": {"
-                              "      \"scripts\": [\"background.js\"]"
-                              "    }"
-                              "  },"
-                              "  \"permissions\": [ \"hid\", \"usb\" ]"
-                              "}"));
+        base::test::ParseJsonDict("{"
+                                  "  \"app\": {"
+                                  "    \"background\": {"
+                                  "      \"scripts\": [\"background.js\"]"
+                                  "    }"
+                                  "  },"
+                                  "  \"permissions\": [ \"hid\", \"usb\" ]"
+                                  "}"));
 
     // Set fake device manager for extensions::UsbDeviceManager.
     mojo::PendingRemote<device::mojom::UsbDeviceManager> usb_manager;

chrome/browser/extensions/permission_message_combinations_unittest.cc

@@ -51,7 +51,7 @@ class PermissionMessageCombinationsUnittest : public testing::Test {
     std::replace(json_manifest_with_double_quotes.begin(),
                  json_manifest_with_double_quotes.end(), '\'', '"');
     app_ = env_.MakeExtension(
-        base::test::ParseJson(json_manifest_with_double_quotes),
+        base::test::ParseJsonDict(json_manifest_with_double_quotes),
         kAllowlistedExtensionID);
   }
 

chrome/browser/extensions/test_extension_environment.cc

@@ -35,19 +35,14 @@ using content::BrowserThread;
 
 namespace {
 
-base::Value::Dict MakeExtensionManifest(const base::Value& manifest_extra) {
+base::Value::Dict MakeExtensionManifest(
+    const base::Value::Dict& manifest_extra) {
   base::Value::Dict manifest = DictionaryBuilder()
                                    .Set("name", "Extension")
                                    .Set("version", "1.0")
                                    .Set("manifest_version", 2)
                                    .BuildDict();
-  if (manifest_extra.is_dict()) {
-    manifest.Merge(manifest_extra.GetDict().Clone());
-  } else {
-    std::string manifest_json;
-    base::JSONWriter::Write(manifest_extra, &manifest_json);
-    ADD_FAILURE() << "Expected dictionary; got \"" << manifest_json << "\"";
-  }
+  manifest.Merge(manifest_extra.Clone());
   return manifest;
 }
 
@@ -128,7 +123,7 @@ ExtensionPrefs* TestExtensionEnvironment::GetExtensionPrefs() {
 }
 
 const Extension* TestExtensionEnvironment::MakeExtension(
-    const base::Value& manifest_extra) {
+    const base::Value::Dict& manifest_extra) {
   base::Value::Dict manifest = MakeExtensionManifest(manifest_extra);
   scoped_refptr<const Extension> result =
       ExtensionBuilder().SetManifest(std::move(manifest)).Build();
@@ -137,7 +132,7 @@ const Extension* TestExtensionEnvironment::MakeExtension(
 }
 
 const Extension* TestExtensionEnvironment::MakeExtension(
-    const base::Value& manifest_extra,
+    const base::Value::Dict& manifest_extra,
     const std::string& id) {
   base::Value::Dict manifest = MakeExtensionManifest(manifest_extra);
   scoped_refptr<const Extension> result =

chrome/browser/extensions/test_extension_environment.h

@@ -78,11 +78,11 @@ class TestExtensionEnvironment {
   // The Extension has a default manifest of {name: "Extension",
   // version: "1.0", manifest_version: 2}, and values in
   // manifest_extra override these defaults.
-  const Extension* MakeExtension(const base::Value& manifest_extra);
+  const Extension* MakeExtension(const base::Value::Dict& manifest_extra);
 
   // Use a specific extension ID instead of the default generated in
   // Extension::Create.
-  const Extension* MakeExtension(const base::Value& manifest_extra,
+  const Extension* MakeExtension(const base::Value::Dict& manifest_extra,
                                  const std::string& id);
 
   // Generates a valid packaged app manifest with the given ID. If |install|

chrome/browser/renderer_context_menu/render_view_context_menu_unittest.cc

@@ -423,9 +423,9 @@ TEST_F(RenderViewContextMenuExtensionsTest,
                   &MenuManagerFactory::BuildServiceInstanceForTesting))));
 
   const Extension* extension1 = environment().MakeExtension(
-      base::DictionaryValue(), "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
+      base::Value::Dict(), "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
   const Extension* extension2 = environment().MakeExtension(
-      base::DictionaryValue(), "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb");
+      base::Value::Dict(), "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb");
 
   // Create two items in two extensions with same title.
   ASSERT_TRUE(

chrome/browser/ui/webui/customize_themes/chrome_customize_themes_handler_unittest.cc

@@ -14,6 +14,7 @@
 #include "base/run_loop.h"
 #include "base/test/bind.h"
 #include "base/test/metrics/histogram_tester.h"
+#include "base/test/values_test_util.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/test_extension_environment.h"
 #include "chrome/browser/new_tab_page/chrome_colors/generated_colors_info.h"
@@ -228,8 +229,8 @@ TEST_F(ChromeCustomizeThemesHandlerTest, InstallThirdPartyTheme) {
       test_data_dir.AppendASCII("extensions/theme_minimal/manifest.json");
   std::string config_contents;
   ASSERT_TRUE(base::ReadFileToString(manifest_path, &config_contents));
-  absl::optional<base::Value> manifest =
-      base::JSONReader::Read(config_contents);
+  absl::optional<base::Value::Dict> manifest =
+      base::test::ParseJsonDict(config_contents);
   ASSERT_TRUE(manifest.has_value());
 
   test::ThemeServiceChangedWaiter waiter(theme_service());

chrome/browser/ui/webui/print_preview/extension_printer_handler_unittest.cc

@@ -569,10 +569,12 @@ TEST_F(ExtensionPrinterHandlerTest, GetUsbPrinters) {
       fake_usb_manager_.CreateAndAddDevice(0, 1, "Google", "USB Printer", "");
   base::RunLoop().RunUntilIdle();
 
-  const Extension* extension_1 = env_.MakeExtension(
-      base::test::ParseJson(kExtension1), "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
-  const Extension* extension_2 = env_.MakeExtension(
-      base::test::ParseJson(kExtension2), "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb");
+  const Extension* extension_1 =
+      env_.MakeExtension(base::test::ParseJsonDict(kExtension1),
+                         "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
+  const Extension* extension_2 =
+      env_.MakeExtension(base::test::ParseJsonDict(kExtension2),
+                         "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb");
 
   extensions::DevicePermissionsManager* permissions_manager =
       extensions::DevicePermissionsManager::Get(env_.profile());