[CodeHealth] Replace remaining Dictionary/ListBuilders in c/b/extensions
This CL does the following changes:
* (extensions::)DictionaryBuilder -> base::Value::Dict
* (extensions::)ListBuilder -> base::Value::List
Also removes obsolete .Build() calls on List/Dict builders.
Bug: 1439232
Change-Id: Icc410e9e1b169be90141ee172c5b58f19e50d752
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4475149
Commit-Queue: Andrew Rayskiy <greengrape@google.com>
Reviewed-by: Devlin Cronin <rdevlin.cronin@chromium.org>
Code-Coverage: Findit <findit-for-me@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/heads/main@{#1136160}
diff --git a/chrome/browser/extensions/active_tab_unittest.cc b/chrome/browser/extensions/active_tab_unittest.cc
index eef104b4..f3e8b74 100644
--- a/chrome/browser/extensions/active_tab_unittest.cc
+++ b/chrome/browser/extensions/active_tab_unittest.cc
@@ -44,7 +44,6 @@
#include "extensions/common/features/feature.h"
#include "extensions/common/features/feature_channel.h"
#include "extensions/common/permissions/permissions_data.h"
-#include "extensions/common/value_builder.h"
#include "extensions/test/test_extension_dir.h"
using extensions::mojom::APIPermissionID;
diff --git a/chrome/browser/extensions/activity_log/activity_log_enabled_unittest.cc b/chrome/browser/extensions/activity_log/activity_log_enabled_unittest.cc
index a3a6bc48..5af6ddb 100644
--- a/chrome/browser/extensions/activity_log/activity_log_enabled_unittest.cc
+++ b/chrome/browser/extensions/activity_log/activity_log_enabled_unittest.cc
@@ -129,11 +129,10 @@
scoped_refptr<const Extension> extension =
ExtensionBuilder()
- .SetManifest(DictionaryBuilder()
+ .SetManifest(base::Value::Dict()
.Set("name", "Watchdog Extension ")
.Set("version", "1.0.0")
- .Set("manifest_version", 2)
- .Build())
+ .Set("manifest_version", 2))
.SetID(kExtensionID)
.Build();
extension_service1->AddExtension(extension.get());
@@ -189,11 +188,10 @@
scoped_refptr<const Extension> extension2 =
ExtensionBuilder()
- .SetManifest(DictionaryBuilder()
+ .SetManifest(base::Value::Dict()
.Set("name", "Watchdog Extension ")
.Set("version", "1.0.0")
- .Set("manifest_version", 2)
- .Build())
+ .Set("manifest_version", 2))
.SetID("fpofdchlamddhnajleknffcbmnjfahpg")
.Build();
extension_service1->AddExtension(extension.get());
@@ -236,11 +234,10 @@
// Enable the extension.
scoped_refptr<const Extension> extension =
ExtensionBuilder()
- .SetManifest(DictionaryBuilder()
+ .SetManifest(base::Value::Dict()
.Set("name", "Watchdog Extension ")
.Set("version", "1.0.0")
- .Set("manifest_version", 2)
- .Build())
+ .Set("manifest_version", 2))
.SetID(kExtensionID)
.Build();
extension_service->AddExtension(extension.get());
@@ -292,11 +289,10 @@
// Testing adding an extension maintains pref and active correctness.
scoped_refptr<const Extension> extension =
ExtensionBuilder()
- .SetManifest(DictionaryBuilder()
+ .SetManifest(base::Value::Dict()
.Set("name", "Watchdog Extension ")
.Set("version", "1.0.0")
- .Set("manifest_version", 2)
- .Build())
+ .Set("manifest_version", 2))
.SetID(kExtensionID)
.Build();
extension_service->AddExtension(extension.get());
diff --git a/chrome/browser/extensions/activity_log/activity_log_policy_unittest.cc b/chrome/browser/extensions/activity_log/activity_log_policy_unittest.cc
index 7ce3576..127209b 100644
--- a/chrome/browser/extensions/activity_log/activity_log_policy_unittest.cc
+++ b/chrome/browser/extensions/activity_log/activity_log_policy_unittest.cc
@@ -9,7 +9,6 @@
#include "chrome/browser/extensions/activity_log/activity_actions.h"
#include "chrome/browser/extensions/activity_log/activity_log_policy.h"
#include "extensions/browser/api/activity_log/web_request_constants.h"
-#include "extensions/common/value_builder.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace extensions {
diff --git a/chrome/browser/extensions/activity_log/activity_log_unittest.cc b/chrome/browser/extensions/activity_log/activity_log_unittest.cc
index a725bede..ab57b9b8 100644
--- a/chrome/browser/extensions/activity_log/activity_log_unittest.cc
+++ b/chrome/browser/extensions/activity_log/activity_log_unittest.cc
@@ -315,11 +315,10 @@
TEST_F(ActivityLogTest, LogPrerender) {
scoped_refptr<const Extension> extension =
ExtensionBuilder()
- .SetManifest(DictionaryBuilder()
+ .SetManifest(base::Value::Dict()
.Set("name", "Test extension")
.Set("version", "1.0.0")
- .Set("manifest_version", 2)
- .Build())
+ .Set("manifest_version", 2))
.Build();
extension_service_->AddExtension(extension.get());
ActivityLog* activity_log = ActivityLog::GetInstance(profile());
@@ -396,8 +395,7 @@
action = new Action(kExtensionId, now - base::Seconds(3),
Action::ACTION_API_CALL, "windows.create");
base::Value::List list;
- base::Value::Dict item;
- item.Set("url", "http://www.google.co.uk");
+ auto item = base::Value::Dict().Set("url", "http://www.google.co.uk");
list.Append(std::move(item));
action->set_args(std::move(list));
activity_log->LogAction(action);
@@ -410,11 +408,10 @@
TEST_F(ActivityLogTest, UninstalledExtension) {
scoped_refptr<const Extension> extension =
ExtensionBuilder()
- .SetManifest(DictionaryBuilder()
+ .SetManifest(base::Value::Dict()
.Set("name", "Test extension")
.Set("version", "1.0.0")
- .Set("manifest_version", 2)
- .Build())
+ .Set("manifest_version", 2))
.Build();
ActivityLog* activity_log = ActivityLog::GetInstance(profile());
diff --git a/chrome/browser/extensions/activity_log/counting_policy_unittest.cc b/chrome/browser/extensions/activity_log/counting_policy_unittest.cc
index b97c4ee..d61c188 100644
--- a/chrome/browser/extensions/activity_log/counting_policy_unittest.cc
+++ b/chrome/browser/extensions/activity_log/counting_policy_unittest.cc
@@ -396,11 +396,10 @@
policy->Init();
scoped_refptr<const Extension> extension =
ExtensionBuilder()
- .SetManifest(DictionaryBuilder()
+ .SetManifest(base::Value::Dict()
.Set("name", "Test extension")
.Set("version", "1.0.0")
- .Set("manifest_version", 2)
- .Build())
+ .Set("manifest_version", 2))
.Build();
extension_service_->AddExtension(extension.get());
scoped_refptr<Action> action = new Action(extension->id(),
@@ -417,16 +416,14 @@
policy->Init();
scoped_refptr<const Extension> extension =
ExtensionBuilder()
- .SetManifest(DictionaryBuilder()
+ .SetManifest(base::Value::Dict()
.Set("name", "Test extension")
.Set("version", "1.0.0")
- .Set("manifest_version", 2)
- .Build())
+ .Set("manifest_version", 2))
.Build();
extension_service_->AddExtension(extension.get());
- base::Value::List args;
- args.Append("hello");
+ auto args = base::Value::List().Append("hello");
args.Append("world");
scoped_refptr<Action> action = new Action(extension->id(),
base::Time::Now(),
@@ -538,11 +535,10 @@
policy->Init();
scoped_refptr<const Extension> extension =
ExtensionBuilder()
- .SetManifest(DictionaryBuilder()
+ .SetManifest(base::Value::Dict()
.Set("name", "Test extension")
.Set("version", "1.0.0")
- .Set("manifest_version", 2)
- .Build())
+ .Set("manifest_version", 2))
.Build();
extension_service_->AddExtension(extension.get());
GURL gurl("http://www.google.com");
diff --git a/chrome/browser/extensions/activity_log/fullstream_ui_policy_unittest.cc b/chrome/browser/extensions/activity_log/fullstream_ui_policy_unittest.cc
index ada6f12..66d7265 100644
--- a/chrome/browser/extensions/activity_log/fullstream_ui_policy_unittest.cc
+++ b/chrome/browser/extensions/activity_log/fullstream_ui_policy_unittest.cc
@@ -341,11 +341,10 @@
policy->Init();
scoped_refptr<const Extension> extension =
ExtensionBuilder()
- .SetManifest(DictionaryBuilder()
+ .SetManifest(base::Value::Dict()
.Set("name", "Test extension")
.Set("version", "1.0.0")
- .Set("manifest_version", 2)
- .Build())
+ .Set("manifest_version", 2))
.Build();
extension_service_->AddExtension(extension.get());
scoped_refptr<Action> action = new Action(extension->id(),
@@ -362,11 +361,10 @@
policy->Init();
scoped_refptr<const Extension> extension =
ExtensionBuilder()
- .SetManifest(DictionaryBuilder()
+ .SetManifest(base::Value::Dict()
.Set("name", "Test extension")
.Set("version", "1.0.0")
- .Set("manifest_version", 2)
- .Build())
+ .Set("manifest_version", 2))
.Build();
extension_service_->AddExtension(extension.get());
GURL gurl("http://www.google.com");
@@ -400,11 +398,10 @@
policy->Init();
scoped_refptr<const Extension> extension =
ExtensionBuilder()
- .SetManifest(DictionaryBuilder()
+ .SetManifest(base::Value::Dict()
.Set("name", "Test extension")
.Set("version", "1.0.0")
- .Set("manifest_version", 2)
- .Build())
+ .Set("manifest_version", 2))
.Build();
extension_service_->AddExtension(extension.get());
GURL gurl("http://www.google.com");
@@ -480,16 +477,14 @@
policy->Init();
scoped_refptr<const Extension> extension =
ExtensionBuilder()
- .SetManifest(DictionaryBuilder()
+ .SetManifest(base::Value::Dict()
.Set("name", "Test extension")
.Set("version", "1.0.0")
- .Set("manifest_version", 2)
- .Build())
+ .Set("manifest_version", 2))
.Build();
extension_service_->AddExtension(extension.get());
- base::Value::List args;
- args.Append("hello");
+ auto args = base::Value::List().Append("hello");
args.Append("world");
scoped_refptr<Action> action = new Action(extension->id(),
base::Time::Now(),
@@ -772,11 +767,10 @@
policy->Init();
scoped_refptr<const Extension> extension =
ExtensionBuilder()
- .SetManifest(DictionaryBuilder()
+ .SetManifest(base::Value::Dict()
.Set("name", "Test extension")
.Set("version", "1.0.0")
- .Set("manifest_version", 2)
- .Build())
+ .Set("manifest_version", 2))
.Build();
extension_service_->AddExtension(extension.get());
GURL gurl("http://www.google.com");
diff --git a/chrome/browser/extensions/content_capabilities_browsertest.cc b/chrome/browser/extensions/content_capabilities_browsertest.cc
index 3b6d60be..adf66901 100644
--- a/chrome/browser/extensions/content_capabilities_browsertest.cc
+++ b/chrome/browser/extensions/content_capabilities_browsertest.cc
@@ -31,10 +31,8 @@
#include "net/test/embedded_test_server/embedded_test_server.h"
#include "storage/browser/quota/special_storage_policy.h"
-using extensions::DictionaryBuilder;
using extensions::Extension;
using extensions::ExtensionBuilder;
-using extensions::ListBuilder;
class ContentCapabilitiesTest : public extensions::ExtensionApiTest {
protected:
diff --git a/chrome/browser/extensions/crx_installer_browsertest.cc b/chrome/browser/extensions/crx_installer_browsertest.cc
index 6a92d03..fd875e5 100644
--- a/chrome/browser/extensions/crx_installer_browsertest.cc
+++ b/chrome/browser/extensions/crx_installer_browsertest.cc
@@ -258,11 +258,10 @@
ASSERT_TRUE(AddFileToDirectory(temp_dir.GetPath(), bar_html, "world"));
ExtensionBuilder builder;
- builder.SetManifest(DictionaryBuilder()
+ builder.SetManifest(base::Value::Dict()
.Set("name", "My First Extension")
.Set("version", version)
- .Set("manifest_version", 2)
- .Build());
+ .Set("manifest_version", 2));
builder.SetID(extension_id);
builder.SetPath(temp_dir.GetPath());
extension_service()->AddExtension(builder.Build().get());
diff --git a/chrome/browser/extensions/error_console/error_console_unittest.cc b/chrome/browser/extensions/error_console/error_console_unittest.cc
index 06845760..399b3b7 100644
--- a/chrome/browser/extensions/error_console/error_console_unittest.cc
+++ b/chrome/browser/extensions/error_console/error_console_unittest.cc
@@ -12,6 +12,7 @@
#include "base/memory/ref_counted.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/utf_string_conversions.h"
+#include "base/values.h"
#include "chrome/common/pref_names.h"
#include "chrome/test/base/testing_profile.h"
#include "components/crx_file/id_util.h"
@@ -25,7 +26,6 @@
#include "extensions/common/constants.h"
#include "extensions/common/extension_builder.h"
#include "extensions/common/features/feature_channel.h"
-#include "extensions/common/value_builder.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace extensions {
@@ -82,11 +82,10 @@
"ohmmkhmmmpcnpikjeljgnaoabkaalbgc";
scoped_refptr<const Extension> adt =
ExtensionBuilder()
- .SetManifest(DictionaryBuilder()
+ .SetManifest(base::Value::Dict()
.Set("name", "apps dev tools")
.Set("version", "0.2.0")
- .Set("manifest_version", 2)
- .Build())
+ .Set("manifest_version", 2))
.SetID(kAppsDeveloperToolsExtensionId)
.Build();
ExtensionRegistry* registry = ExtensionRegistry::Get(profile_.get());
@@ -197,21 +196,19 @@
// For this, we need actual extensions.
scoped_refptr<const Extension> unpacked_extension =
ExtensionBuilder()
- .SetManifest(DictionaryBuilder()
+ .SetManifest(base::Value::Dict()
.Set("name", "unpacked")
.Set("version", "0.0.1")
- .Set("manifest_version", 2)
- .Build())
+ .Set("manifest_version", 2))
.SetLocation(mojom::ManifestLocation::kUnpacked)
.SetID(crx_file::id_util::GenerateId("unpacked"))
.Build();
scoped_refptr<const Extension> packed_extension =
ExtensionBuilder()
- .SetManifest(DictionaryBuilder()
+ .SetManifest(base::Value::Dict()
.Set("name", "packed")
.Set("version", "0.0.1")
- .Set("manifest_version", 2)
- .Build())
+ .Set("manifest_version", 2))
.SetLocation(mojom::ManifestLocation::kInternal)
.SetID(crx_file::id_util::GenerateId("packed"))
.Build();
diff --git a/chrome/browser/extensions/extension_action_runner_unittest.cc b/chrome/browser/extensions/extension_action_runner_unittest.cc
index 6956a60..8583bed0 100644
--- a/chrome/browser/extensions/extension_action_runner_unittest.cc
+++ b/chrome/browser/extensions/extension_action_runner_unittest.cc
@@ -32,7 +32,6 @@
#include "extensions/common/mojom/injection_type.mojom-shared.h"
#include "extensions/common/mojom/run_location.mojom-shared.h"
#include "extensions/common/user_script.h"
-#include "extensions/common/value_builder.h"
namespace extensions {
@@ -103,15 +102,13 @@
const std::string kId = crx_file::id_util::GenerateId("all_hosts_extension");
extension_ =
ExtensionBuilder()
- .SetManifest(
- DictionaryBuilder()
- .Set("name", "all_hosts_extension")
- .Set("description", "an extension")
- .Set("manifest_version", 2)
- .Set("version", "1.0.0")
- .Set("permissions",
- ListBuilder().Append(kAllHostsPermission).Build())
- .Build())
+ .SetManifest(base::Value::Dict()
+ .Set("name", "all_hosts_extension")
+ .Set("description", "an extension")
+ .Set("manifest_version", 2)
+ .Set("version", "1.0.0")
+ .Set("permissions", base::Value::List().Append(
+ kAllHostsPermission)))
.SetLocation(mojom::ManifestLocation::kInternal)
.SetID(kId)
.Build();
diff --git a/chrome/browser/extensions/extension_context_menu_model_unittest.cc b/chrome/browser/extensions/extension_context_menu_model_unittest.cc
index 0ac3fb1..9abf81f 100644
--- a/chrome/browser/extensions/extension_context_menu_model_unittest.cc
+++ b/chrome/browser/extensions/extension_context_menu_model_unittest.cc
@@ -15,6 +15,7 @@
#include "base/strings/utf_string_conversions.h"
#include "base/test/metrics/histogram_tester.h"
#include "base/test/metrics/user_action_tester.h"
+#include "base/values.h"
#include "build/chromeos_buildflags.h"
#include "chrome/app/chrome_command_ids.h"
#include "chrome/browser/extensions/chrome_extension_browser_constants.h"
@@ -56,7 +57,6 @@
#include "extensions/common/mojom/manifest.mojom-shared.h"
#include "extensions/common/mojom/run_location.mojom-shared.h"
#include "extensions/common/permissions/permissions_data.h"
-#include "extensions/common/value_builder.h"
#include "extensions/test/permissions_manager_waiter.h"
#include "net/disk_cache/blockfile/disk_format_base.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -313,15 +313,17 @@
const char* action_key,
ManifestLocation location,
const std::string& host_permission) {
- DictionaryBuilder manifest;
- manifest.Set("name", name).Set("version", "1").Set("manifest_version", 2);
+ auto manifest = base::Value::Dict()
+ .Set("name", name)
+ .Set("version", "1")
+ .Set("manifest_version", 2);
if (action_key)
- manifest.Set(action_key, DictionaryBuilder().Build());
+ manifest.Set(action_key, base::Value::Dict());
if (!host_permission.empty())
- manifest.Set("permissions", ListBuilder().Append(host_permission).Build());
+ manifest.Set("permissions", base::Value::List().Append(host_permission));
scoped_refptr<const Extension> extension =
ExtensionBuilder()
- .SetManifest(manifest.Build())
+ .SetManifest(std::move(manifest))
.SetID(crx_file::id_util::GenerateId(name))
.SetLocation(location)
.Build();
@@ -500,13 +502,11 @@
InitializeEmptyExtensionService();
std::string name("component");
- base::Value::Dict manifest =
- DictionaryBuilder()
- .Set("name", name)
- .Set("version", "1")
- .Set("manifest_version", 2)
- .Set("browser_action", DictionaryBuilder().Build())
- .Build();
+ base::Value::Dict manifest = base::Value::Dict()
+ .Set("name", name)
+ .Set("version", "1")
+ .Set("manifest_version", 2)
+ .Set("browser_action", base::Value::Dict());
{
scoped_refptr<const Extension> extension =
diff --git a/chrome/browser/extensions/extension_cookies_browsertest.cc b/chrome/browser/extensions/extension_cookies_browsertest.cc
index b08f664..0da94b4 100644
--- a/chrome/browser/extensions/extension_cookies_browsertest.cc
+++ b/chrome/browser/extensions/extension_cookies_browsertest.cc
@@ -16,6 +16,7 @@
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
#include "base/test/scoped_feature_list.h"
+#include "base/values.h"
#include "chrome/browser/extensions/chrome_test_extension_loader.h"
#include "chrome/browser/extensions/extension_action_runner.h"
#include "chrome/browser/extensions/extension_browsertest.h"
@@ -33,7 +34,6 @@
#include "content/public/test/test_utils.h"
#include "extensions/browser/browsertest_util.h"
#include "extensions/common/permissions/permissions_data.h"
-#include "extensions/common/value_builder.h"
#include "extensions/test/extension_test_message_listener.h"
#include "extensions/test/test_extension_dir.h"
#include "mojo/public/cpp/bindings/remote.h"
diff --git a/chrome/browser/extensions/extension_error_controller_unittest.cc b/chrome/browser/extensions/extension_error_controller_unittest.cc
index 0fab43c..63e8efa 100644
--- a/chrome/browser/extensions/extension_error_controller_unittest.cc
+++ b/chrome/browser/extensions/extension_error_controller_unittest.cc
@@ -6,6 +6,7 @@
#include "base/memory/raw_ptr.h"
#include "base/memory/ref_counted.h"
+#include "base/values.h"
#include "chrome/browser/extensions/extension_error_ui.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/extension_service_test_base.h"
@@ -18,7 +19,6 @@
#include "extensions/browser/pref_names.h"
#include "extensions/common/extension.h"
#include "extensions/common/extension_builder.h"
-#include "extensions/common/value_builder.h"
namespace extensions {
@@ -96,11 +96,10 @@
// Builds and returns a simple extension.
scoped_refptr<const Extension> BuildExtension() {
return ExtensionBuilder()
- .SetManifest(DictionaryBuilder()
+ .SetManifest(base::Value::Dict()
.Set("name", "My Wonderful Extension")
.Set("version", "0.1.1.0")
- .Set("manifest_version", 2)
- .Build())
+ .Set("manifest_version", 2))
.Build();
}
diff --git a/chrome/browser/extensions/extension_garbage_collector_chromeos_unittest.cc b/chrome/browser/extensions/extension_garbage_collector_chromeos_unittest.cc
index 0d8b28f..fa8226f 100644
--- a/chrome/browser/extensions/extension_garbage_collector_chromeos_unittest.cc
+++ b/chrome/browser/extensions/extension_garbage_collector_chromeos_unittest.cc
@@ -32,7 +32,6 @@
#include "extensions/browser/extension_prefs.h"
#include "extensions/browser/install_flag.h"
#include "extensions/common/extension_builder.h"
-#include "extensions/common/value_builder.h"
#include "ppapi/buildflags/buildflags.h"
#if BUILDFLAG(ENABLE_PLUGINS)
diff --git a/chrome/browser/extensions/extension_install_prompt_unittest.cc b/chrome/browser/extensions/extension_install_prompt_unittest.cc
index 051bb16..bed5e3a 100644
--- a/chrome/browser/extensions/extension_install_prompt_unittest.cc
+++ b/chrome/browser/extensions/extension_install_prompt_unittest.cc
@@ -15,6 +15,7 @@
#include "base/test/repeating_test_future.h"
#include "base/test/scoped_feature_list.h"
#include "base/test/test_future.h"
+#include "base/values.h"
#include "chrome/browser/extensions/extension_install_prompt_show_params.h"
#include "chrome/browser/extensions/extension_service_test_with_install.h"
#include "chrome/test/base/testing_profile.h"
@@ -34,7 +35,6 @@
#include "extensions/common/permissions/manifest_permission_set.h"
#include "extensions/common/permissions/permission_set.h"
#include "extensions/common/url_pattern_set.h"
-#include "extensions/common/value_builder.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/gfx/image/image_skia.h"
#include "ui/gfx/skia_util.h"
@@ -89,12 +89,11 @@
URLPatternSet(), URLPatternSet()));
scoped_refptr<const Extension> extension =
ExtensionBuilder()
- .SetManifest(DictionaryBuilder()
+ .SetManifest(base::Value::Dict()
.Set("name", "foo")
.Set("version", "1.0")
.Set("manifest_version", 2)
- .Set("description", "Random Ext")
- .Build())
+ .Set("description", "Random Ext"))
.Build();
content::TestWebContentsFactory factory;
@@ -116,16 +115,15 @@
DelegatedPromptShowsOptionalPermissions) {
scoped_refptr<const Extension> extension =
ExtensionBuilder()
- .SetManifest(DictionaryBuilder()
+ .SetManifest(base::Value::Dict()
.Set("name", "foo")
.Set("version", "1.0")
.Set("manifest_version", 2)
.Set("description", "Random Ext")
.Set("permissions",
- ListBuilder().Append("clipboardRead").Build())
+ base::Value::List().Append("clipboardRead"))
.Set("optional_permissions",
- ListBuilder().Append("tabs").Build())
- .Build())
+ base::Value::List().Append("tabs")))
.Build();
content::TestWebContentsFactory factory;
diff --git a/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc b/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc
index f79d1b01..61a82a4 100644
--- a/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc
+++ b/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc
@@ -49,7 +49,6 @@
#include "extensions/common/extension_builder.h"
#include "extensions/common/feature_switch.h"
#include "extensions/common/features/feature_channel.h"
-#include "extensions/common/value_builder.h"
#include "testing/gtest/include/gtest/gtest.h"
using extensions::mojom::ManifestLocation;
@@ -198,11 +197,10 @@
const std::string& id,
ManifestLocation location) {
ExtensionBuilder builder;
- builder.SetManifest(DictionaryBuilder()
+ builder.SetManifest(base::Value::Dict()
.Set("name", std::string("Extension " + index))
.Set("version", "1.0")
- .Set("manifest_version", 2)
- .Build());
+ .Set("manifest_version", 2));
builder.SetLocation(location);
builder.SetID(id);
service_->AddExtension(builder.Build().get());
@@ -217,14 +215,12 @@
ManifestLocation location) {
ExtensionBuilder builder;
builder.SetManifest(
- DictionaryBuilder()
+ base::Value::Dict()
.Set("name", std::string("Extension " + index))
.Set("version", "1.0")
.Set("manifest_version", 2)
- .Set("browser_action", DictionaryBuilder()
- .Set("default_title", "Default title")
- .Build())
- .Build());
+ .Set("browser_action",
+ base::Value::Dict().Set("default_title", "Default title")));
builder.SetLocation(location);
builder.SetID(id);
service_->AddExtension(builder.Build().get());
@@ -239,15 +235,13 @@
const std::string& id,
ManifestLocation location) {
ExtensionBuilder builder;
- builder.SetManifest(DictionaryBuilder()
- .Set("name", std::string("Extension " + index))
- .Set("version", "1.0")
- .Set("manifest_version", 2)
- .Set("chrome_settings_overrides",
- DictionaryBuilder()
- .Set("homepage", "http://www.google.com")
- .Build())
- .Build());
+ builder.SetManifest(
+ base::Value::Dict()
+ .Set("name", std::string("Extension " + index))
+ .Set("version", "1.0")
+ .Set("manifest_version", 2)
+ .Set("chrome_settings_overrides",
+ base::Value::Dict().Set("homepage", "http://www.google.com")));
builder.SetLocation(location);
builder.SetID(id);
service_->AddExtension(builder.Build().get());
@@ -263,16 +257,14 @@
ManifestLocation location) {
ExtensionBuilder builder;
builder.SetManifest(
- DictionaryBuilder()
+ base::Value::Dict()
.Set("name", std::string("Extension " + index))
.Set("version", "1.0")
.Set("manifest_version", 2)
.Set("chrome_settings_overrides",
- DictionaryBuilder()
- .Set("startup_pages",
- ListBuilder().Append("http://www.google.com").Build())
- .Build())
- .Build());
+ base::Value::Dict().Set(
+ "startup_pages",
+ base::Value::List().Append("http://www.google.com"))));
builder.SetLocation(location);
builder.SetID(id);
service_->AddExtension(builder.Build().get());
@@ -288,13 +280,12 @@
ManifestLocation location) {
ExtensionBuilder builder;
builder.SetManifest(
- DictionaryBuilder()
+ base::Value::Dict()
.Set("name", std::string("Extension " + index))
.Set("version", "1.0")
.Set("manifest_version", 2)
.Set("chrome_url_overrides",
- DictionaryBuilder().Set("newtab", "Default.html").Build())
- .Build());
+ base::Value::Dict().Set("newtab", "Default.html")));
builder.SetLocation(location);
builder.SetID(id);
@@ -311,12 +302,11 @@
ManifestLocation location) {
ExtensionBuilder builder;
builder.SetManifest(
- DictionaryBuilder()
+ base::Value::Dict()
.Set("name", std::string("Extension " + index))
.Set("version", "1.0")
.Set("manifest_version", 2)
- .Set("permissions", ListBuilder().Append("proxy").Build())
- .Build());
+ .Set("permissions", base::Value::List().Append("proxy")));
builder.SetLocation(location);
builder.SetID(id);
diff --git a/chrome/browser/extensions/extension_navigation_throttle_unittest.cc b/chrome/browser/extensions/extension_navigation_throttle_unittest.cc
index 00ad5a5..55af5b0 100644
--- a/chrome/browser/extensions/extension_navigation_throttle_unittest.cc
+++ b/chrome/browser/extensions/extension_navigation_throttle_unittest.cc
@@ -8,6 +8,7 @@
#include "base/command_line.h"
#include "base/memory/raw_ptr.h"
#include "base/strings/stringprintf.h"
+#include "base/values.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/test_extension_system.h"
#include "chrome/test/base/chrome_render_view_host_test_harness.h"
@@ -23,7 +24,6 @@
#include "extensions/common/extension.h"
#include "extensions/common/extension_builder.h"
#include "extensions/common/identifiability_metrics.h"
-#include "extensions/common/value_builder.h"
#include "services/metrics/public/cpp/ukm_source_id.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/blink/public/common/privacy_budget/identifiability_metrics.h"
@@ -75,15 +75,17 @@
// Constructs an extension with accessible.html and accessible_dir/* as
// accessible resources.
- DictionaryBuilder manifest;
- manifest.Set("name", "ext")
- .Set("description", "something")
- .Set("version", "0.1")
- .Set("manifest_version", 2)
- .Set("web_accessible_resources",
- ListBuilder().Append(kAccessible).Append(kAccessibleDir).Build());
+ auto manifest =
+ base::Value::Dict()
+ .Set("name", "ext")
+ .Set("description", "something")
+ .Set("version", "0.1")
+ .Set("manifest_version", 2)
+ .Set(
+ "web_accessible_resources",
+ base::Value::List().Append(kAccessible).Append(kAccessibleDir));
extension_ = ExtensionBuilder()
- .SetManifest(manifest.Build())
+ .SetManifest(std::move(manifest))
.SetID(crx_file::id_util::GenerateId("foo"))
.Build();
ASSERT_TRUE(extension_);
diff --git a/chrome/browser/extensions/extension_protocols_unittest.cc b/chrome/browser/extensions/extension_protocols_unittest.cc
index 6e5a9c5..3005049 100644
--- a/chrome/browser/extensions/extension_protocols_unittest.cc
+++ b/chrome/browser/extensions/extension_protocols_unittest.cc
@@ -43,7 +43,6 @@
#include "extensions/common/extension_paths.h"
#include "extensions/common/file_util.h"
#include "extensions/common/identifiability_metrics.h"
-#include "extensions/common/value_builder.h"
#include "extensions/test/test_extension_dir.h"
#include "mojo/public/cpp/bindings/pending_remote.h"
#include "net/traffic_annotation/network_traffic_annotation_test_helper.h"
@@ -85,8 +84,7 @@
scoped_refptr<Extension> CreateTestExtension(const std::string& name,
bool incognito_split_mode,
const ExtensionId& extension_id) {
- base::Value::Dict manifest;
- manifest.Set("name", name);
+ auto manifest = base::Value::Dict().Set("name", name);
manifest.Set("version", "1");
manifest.Set("manifest_version", 2);
manifest.Set("incognito", incognito_split_mode ? "split" : "spanning");
@@ -108,15 +106,13 @@
scoped_refptr<Extension> CreateWebStoreExtension() {
base::Value::Dict manifest =
- DictionaryBuilder()
+ base::Value::Dict()
.Set("name", "WebStore")
.Set("version", "1")
.Set("manifest_version", 2)
- .Set("icons",
- DictionaryBuilder().Set("16", "webstore_icon_16.png").Build())
+ .Set("icons", base::Value::Dict().Set("16", "webstore_icon_16.png"))
.Set("web_accessible_resources",
- ListBuilder().Append("webstore_icon_16.png").Build())
- .Build();
+ base::Value::List().Append("webstore_icon_16.png"));
base::FilePath path;
EXPECT_TRUE(base::PathService::Get(chrome::DIR_RESOURCES, &path));
@@ -133,7 +129,7 @@
scoped_refptr<const Extension> CreateTestResponseHeaderExtension() {
return ExtensionBuilder("An extension with web-accessible resources")
.SetManifestKey("web_accessible_resources",
- ListBuilder().Append("test.dat").Build())
+ base::Value::List().Append("test.dat"))
.SetPath(GetTestPath("response_headers"))
.Build();
}
diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc
index 8b324e8d..0e728ad 100644
--- a/chrome/browser/extensions/extension_service_unittest.cc
+++ b/chrome/browser/extensions/extension_service_unittest.cc
@@ -147,7 +147,6 @@
#include "extensions/common/permissions/permissions_data.h"
#include "extensions/common/switches.h"
#include "extensions/common/url_pattern.h"
-#include "extensions/common/value_builder.h"
#include "extensions/common/verifier_formats.h"
#include "extensions/test/test_extension_dir.h"
#include "mojo/public/cpp/bindings/remote.h"
@@ -296,11 +295,10 @@
EXPECT_TRUE(base::WriteFile(file, data));
}
- base::Value::Dict manifest = DictionaryBuilder()
+ base::Value::Dict manifest = base::Value::Dict()
.Set(keys::kName, "Test extension")
.Set(keys::kVersion, "1.0")
- .Set(keys::kManifestVersion, 2)
- .Build();
+ .Set(keys::kManifestVersion, 2);
// Persist manifest file.
base::FilePath manifest_path = extension_dir.Append(kManifestFilename);
@@ -2195,8 +2193,7 @@
host_permissions.insert("https://*.google.com/*");
host_permissions.insert("http://*.google.com.hk/*");
- base::Value::List api_permissions;
- api_permissions.Append("tabs");
+ auto api_permissions = base::Value::List().Append("tabs");
SetPrefList(extension_id, "granted_permissions.api", api_permissions,
"granted_permissions.api");
SetPrefStringSet(
@@ -2698,8 +2695,7 @@
ASSERT_FALSE(base::PathExists(manifest_dir));
// First create a correct manifest and Load the extension successfully.
- base::Value::Dict manifest;
- manifest.Set("version", "1.0");
+ auto manifest = base::Value::Dict().Set("version", "1.0");
manifest.Set("name", "malformed manifest reload test");
manifest.Set("manifest_version", 2);
@@ -7809,7 +7805,7 @@
scoped_refptr<const Extension> extension =
ExtensionBuilder("Shared Module")
.SetManifestPath("export.resources",
- ListBuilder().Append("foo.js").Build())
+ base::Value::List().Append("foo.js"))
.AddFlags(Extension::FROM_WEBSTORE)
.Build();
diff --git a/chrome/browser/extensions/extension_web_ui_unittest.cc b/chrome/browser/extensions/extension_web_ui_unittest.cc
index 2e5592d..07628df 100644
--- a/chrome/browser/extensions/extension_web_ui_unittest.cc
+++ b/chrome/browser/extensions/extension_web_ui_unittest.cc
@@ -85,15 +85,16 @@
TEST_F(ExtensionWebUITest, ExtensionURLOverride) {
const char kOverrideResource[] = "1.html";
// Register a non-component extension.
- DictionaryBuilder manifest;
- manifest.Set(manifest_keys::kName, "ext1")
- .Set(manifest_keys::kVersion, "0.1")
- .Set(manifest_keys::kManifestVersion, 2)
- .Set(api::chrome_url_overrides::ManifestKeys::kChromeUrlOverrides,
- DictionaryBuilder().Set("bookmarks", kOverrideResource).Build());
+ auto manifest =
+ base::Value::Dict()
+ .Set(manifest_keys::kName, "ext1")
+ .Set(manifest_keys::kVersion, "0.1")
+ .Set(manifest_keys::kManifestVersion, 2)
+ .Set(api::chrome_url_overrides::ManifestKeys::kChromeUrlOverrides,
+ base::Value::Dict().Set("bookmarks", kOverrideResource));
scoped_refptr<const Extension> ext_unpacked(
ExtensionBuilder()
- .SetManifest(manifest.Build())
+ .SetManifest(std::move(manifest))
.SetLocation(ManifestLocation::kUnpacked)
.SetID("abcdefghijabcdefghijabcdefghijaa")
.Build());
@@ -121,15 +122,16 @@
// Register a component extension
const char kOverrideResource2[] = "2.html";
- DictionaryBuilder manifest2;
- manifest2.Set(manifest_keys::kName, "ext2")
- .Set(manifest_keys::kVersion, "0.1")
- .Set(manifest_keys::kManifestVersion, 2)
- .Set(api::chrome_url_overrides::ManifestKeys::kChromeUrlOverrides,
- DictionaryBuilder().Set("bookmarks", kOverrideResource2).Build());
+ auto manifest2 =
+ base::Value::Dict()
+ .Set(manifest_keys::kName, "ext2")
+ .Set(manifest_keys::kVersion, "0.1")
+ .Set(manifest_keys::kManifestVersion, 2)
+ .Set(api::chrome_url_overrides::ManifestKeys::kChromeUrlOverrides,
+ base::Value::Dict().Set("bookmarks", kOverrideResource2));
scoped_refptr<const Extension> ext_component(
ExtensionBuilder()
- .SetManifest(manifest2.Build())
+ .SetManifest(std::move(manifest2))
.SetLocation(ManifestLocation::kComponent)
.SetID("bbabcdefghijabcdefghijabcdefghij")
.Build());
@@ -187,19 +189,16 @@
// Add multiple entries for the same extension.
ScopedDictPrefUpdate update(prefs, ExtensionWebUI::kExtensionURLOverrides);
base::Value::Dict& all_overrides = update.Get();
- base::Value::List newtab_list;
- {
- base::Value::Dict newtab;
- newtab.Set("entry", newtab_url.spec());
- newtab.Set("active", true);
- newtab_list.Append(std::move(newtab));
- }
- {
- base::Value::Dict newtab;
- newtab.Set("entry", extension->GetResourceURL("oldtab.html").spec());
- newtab.Set("active", true);
- newtab_list.Append(std::move(newtab));
- }
+
+ auto newtab_list =
+ base::Value::List()
+ .Append(base::Value::Dict()
+ .Set("entry", newtab_url.spec())
+ .Set("active", true))
+ .Append(base::Value::Dict()
+ .Set("entry",
+ extension->GetResourceURL("oldtab.html").spec())
+ .Set("active", true));
all_overrides.Set("newtab", std::move(newtab_list));
}
@@ -265,7 +264,7 @@
TEST_F(ExtensionWebUITest, TestNumExtensionsOverridingURL) {
auto load_extension_overriding_newtab = [this](const char* name) {
base::Value::Dict chrome_url_overrides =
- DictionaryBuilder().Set("newtab", "newtab.html").Build();
+ base::Value::Dict().Set("newtab", "newtab.html");
scoped_refptr<const Extension> extension =
ExtensionBuilder(name)
.SetLocation(ManifestLocation::kInternal)
diff --git a/chrome/browser/extensions/external_registry_loader_win_unittest.cc b/chrome/browser/extensions/external_registry_loader_win_unittest.cc
index 5e664713..1e970db 100644
--- a/chrome/browser/extensions/external_registry_loader_win_unittest.cc
+++ b/chrome/browser/extensions/external_registry_loader_win_unittest.cc
@@ -9,7 +9,6 @@
#include "base/run_loop.h"
#include "base/values.h"
#include "content/public/test/browser_task_environment.h"
-#include "extensions/common/value_builder.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -40,7 +39,7 @@
~TestExternalRegistryLoader() override {}
base::Value::Dict LoadPrefsOnBlockingThread() override {
- return DictionaryBuilder().Set(kDummyRegistryKey, id_++).Build();
+ return base::Value::Dict().Set(kDummyRegistryKey, id_++);
}
void LoadFinished(base::Value::Dict prefs) override {
++load_finished_count_;
diff --git a/chrome/browser/extensions/forced_extensions/force_installed_metrics_unittest.cc b/chrome/browser/extensions/forced_extensions/force_installed_metrics_unittest.cc
index f5c76cc..557b333 100644
--- a/chrome/browser/extensions/forced_extensions/force_installed_metrics_unittest.cc
+++ b/chrome/browser/extensions/forced_extensions/force_installed_metrics_unittest.cc
@@ -31,7 +31,6 @@
#include "extensions/browser/updater/safe_manifest_parser.h"
#include "extensions/common/extension.h"
#include "extensions/common/manifest.h"
-#include "extensions/common/value_builder.h"
#include "net/base/net_errors.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -183,14 +182,12 @@
void SetupExtensionManagementPref() {
base::Value::Dict extension_entry =
- DictionaryBuilder()
+ base::Value::Dict()
.Set("installation_mode", "allowed")
- .Set(ExternalProviderImpl::kExternalUpdateUrl, kExtensionUpdateUrl)
- .Build();
- prefs()->SetManagedPref(pref_names::kExtensionManagement,
- DictionaryBuilder()
- .Set(kExtensionId1, std::move(extension_entry))
- .Build());
+ .Set(ExternalProviderImpl::kExternalUpdateUrl, kExtensionUpdateUrl);
+ prefs()->SetManagedPref(
+ pref_names::kExtensionManagement,
+ base::Value::Dict().Set(kExtensionId1, std::move(extension_entry)));
}
void CreateExtensionService(bool extensions_enabled) {
@@ -1362,7 +1359,7 @@
SetupForceList(ExtensionOrigin::kWebStore);
// Set TYPE_EXTENSION and TYPE_THEME as the allowed extension types.
base::Value::List list =
- ListBuilder().Append("extension").Append("theme").Build();
+ base::Value::List().Append("extension").Append("theme");
prefs()->SetManagedPref(pref_names::kAllowedTypes, std::move(list));
scoped_refptr<const Extension> ext1 = CreateNewExtension(
@@ -1392,7 +1389,7 @@
// Set TYPE_EXTENSION and TYPE_THEME as the allowed extension types.
base::Value::List list =
- ListBuilder().Append("extension").Append("theme").Build();
+ base::Value::List().Append("extension").Append("theme");
prefs()->SetManagedPref(pref_names::kAllowedTypes, std::move(list));
scoped_refptr<const Extension> ext1 = CreateNewExtension(
diff --git a/chrome/browser/extensions/forced_extensions/force_installed_test_base.cc b/chrome/browser/extensions/forced_extensions/force_installed_test_base.cc
index 70ab1e3..63eeee30f 100644
--- a/chrome/browser/extensions/forced_extensions/force_installed_test_base.cc
+++ b/chrome/browser/extensions/forced_extensions/force_installed_test_base.cc
@@ -66,16 +66,13 @@
list.Append(base::StrCat({kExtensionId1, ";", update_url}));
list.Append(base::StrCat({kExtensionId2, ";", update_url}));
base::Value::Dict dict =
- DictionaryBuilder()
+ base::Value::Dict()
.Set(kExtensionId1,
- DictionaryBuilder()
- .Set(ExternalProviderImpl::kExternalUpdateUrl, update_url)
- .Build())
+ base::Value::Dict().Set(ExternalProviderImpl::kExternalUpdateUrl,
+ update_url))
.Set(kExtensionId2,
- DictionaryBuilder()
- .Set(ExternalProviderImpl::kExternalUpdateUrl, update_url)
- .Build())
- .Build();
+ base::Value::Dict().Set(ExternalProviderImpl::kExternalUpdateUrl,
+ update_url));
prefs_->SetManagedPref(pref_names::kInstallForceList, std::move(dict));
EXPECT_CALL(policy_provider_, IsInitializationComplete(testing::_))
@@ -92,8 +89,7 @@
}
void ForceInstalledTestBase::SetupEmptyForceList() {
- base::Value::Dict dict = DictionaryBuilder().Build();
- prefs_->SetManagedPref(pref_names::kInstallForceList, std::move(dict));
+ prefs_->SetManagedPref(pref_names::kInstallForceList, base::Value::Dict());
EXPECT_CALL(policy_provider_, IsInitializationComplete(testing::_))
.WillRepeatedly(testing::Return(true));
diff --git a/chrome/browser/extensions/install_verifier_unittest.cc b/chrome/browser/extensions/install_verifier_unittest.cc
index 2fde5f58..3ce9bb6a 100644
--- a/chrome/browser/extensions/install_verifier_unittest.cc
+++ b/chrome/browser/extensions/install_verifier_unittest.cc
@@ -15,7 +15,6 @@
#include "extensions/common/extension_builder.h"
#include "extensions/common/extension_urls.h"
#include "extensions/common/manifest.h"
-#include "extensions/common/value_builder.h"
#include "testing/gtest/include/gtest/gtest.h"
using extensions::mojom::ManifestLocation;
@@ -40,10 +39,10 @@
// Adds an extension as being allowed by policy.
void AddExtensionAsPolicyInstalled(const ExtensionId& id) {
base::Value::Dict extension_entry =
- DictionaryBuilder().Set("installation_mode", "allowed").Build();
+ base::Value::Dict().Set("installation_mode", "allowed");
testing_profile()->GetTestingPrefService()->SetManagedPref(
pref_names::kExtensionManagement,
- DictionaryBuilder().Set(id, std::move(extension_entry)).Build());
+ base::Value::Dict().Set(id, std::move(extension_entry)));
EXPECT_TRUE(ExtensionManagementFactory::GetForBrowserContext(profile())
->IsInstallationExplicitlyAllowed(id));
}
diff --git a/chrome/browser/extensions/permission_messages_unittest.cc b/chrome/browser/extensions/permission_messages_unittest.cc
index d4764a1c..54839f6 100644
--- a/chrome/browser/extensions/permission_messages_unittest.cc
+++ b/chrome/browser/extensions/permission_messages_unittest.cc
@@ -8,6 +8,7 @@
#include <utility>
#include "base/strings/utf_string_conversions.h"
+#include "base/values.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/permissions_test_util.h"
#include "chrome/browser/extensions/permissions_updater.h"
@@ -26,7 +27,6 @@
#include "extensions/common/permissions/permissions_info.h"
#include "extensions/common/permissions/usb_device_permission.h"
#include "extensions/common/permissions/usb_device_permission_data.h"
-#include "extensions/common/value_builder.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/base/l10n/l10n_util.h"
@@ -124,7 +124,7 @@
// other (the 'history' permission has superset permissions).
TEST_F(PermissionMessagesUnittest, HistoryHidesTabsMessage) {
CreateAndInstallExtensionWithPermissions(
- ListBuilder().Append("tabs").Append("history").Build(),
+ base::Value::List().Append("tabs").Append("history"),
base::Value::List());
ASSERT_EQ(1U, required_permissions().size());
@@ -139,8 +139,8 @@
// permission, only the new coalesced message is displayed.
TEST_F(PermissionMessagesUnittest, MixedPermissionMessagesCoalesceOnceGranted) {
CreateAndInstallExtensionWithPermissions(
- ListBuilder().Append("tabs").Build(),
- ListBuilder().Append("history").Build());
+ base::Value::List().Append("tabs"),
+ base::Value::List().Append("history"));
ASSERT_EQ(1U, required_permissions().size());
EXPECT_EQ(
@@ -178,8 +178,8 @@
TEST_F(PermissionMessagesUnittest,
AntiTest_PromptCanRequestSubsetOfAlreadyGrantedPermissions) {
CreateAndInstallExtensionWithPermissions(
- ListBuilder().Append("history").Build(),
- ListBuilder().Append("tabs").Build());
+ base::Value::List().Append("history"),
+ base::Value::List().Append("tabs"));
ASSERT_EQ(1U, required_permissions().size());
EXPECT_EQ(l10n_util::GetStringUTF16(
@@ -219,8 +219,8 @@
TEST_F(PermissionMessagesUnittest,
AntiTest_PromptCanBeEmptyButCausesChangeInPermissions) {
CreateAndInstallExtensionWithPermissions(
- ListBuilder().Append("tabs").Build(),
- ListBuilder().Append("sessions").Build());
+ base::Value::List().Append("tabs"),
+ base::Value::List().Append("sessions"));
ASSERT_EQ(1U, required_permissions().size());
EXPECT_EQ(
@@ -265,9 +265,9 @@
const char16_t kMessage[] =
u"Access any PVR Mass Storage from HUMAX Co., Ltd. via USB";
- base::Value::List permission_list;
- permission_list.Append(base::Value::FromUniquePtrValue(
- UsbDevicePermissionData(0x02ad, 0x138c, -1, -1).ToValue()));
+ auto permission_list =
+ base::Value::List().Append(base::Value::FromUniquePtrValue(
+ UsbDevicePermissionData(0x02ad, 0x138c, -1, -1).ToValue()));
base::Value permission_value = base::Value(std::move(permission_list));
UsbDevicePermission permission(
diff --git a/chrome/browser/extensions/permissions_updater_unittest.cc b/chrome/browser/extensions/permissions_updater_unittest.cc
index e24e1c6..e3748cec 100644
--- a/chrome/browser/extensions/permissions_updater_unittest.cc
+++ b/chrome/browser/extensions/permissions_updater_unittest.cc
@@ -33,7 +33,6 @@
#include "extensions/common/extension_features.h"
#include "extensions/common/permissions/permission_set.h"
#include "extensions/common/permissions/permissions_data.h"
-#include "extensions/common/value_builder.h"
#include "extensions/test/permissions_manager_waiter.h"
#include "extensions/test/test_extension_dir.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -52,14 +51,13 @@
return ExtensionBuilder()
.SetLocation(mojom::ManifestLocation::kInternal)
.SetManifest(
- DictionaryBuilder()
+ base::Value::Dict()
.Set("name", name)
.Set("description", "foo")
.Set("manifest_version", 2)
.Set("version", "0.1.2.3")
.Set("permissions", std::move(permissions))
- .Set("optional_permissions", std::move(optional_permissions))
- .Build())
+ .Set("optional_permissions", std::move(optional_permissions)))
.SetID(crx_file::id_util::GenerateId(name))
.Build();
}
@@ -84,10 +82,9 @@
ExtensionBuilder("permissions")
.AddPermissions({"management", "http://a.com/*"})
.SetManifestKey("optional_permissions",
- ListBuilder()
+ base::Value::List()
.Append("http://*.c.com/*")
- .Append("notifications")
- .Build())
+ .Append("notifications"))
.Build();
{
@@ -218,13 +215,14 @@
{
// Test revoking optional permissions.
- ListBuilder optional_permissions;
- optional_permissions.Append("tabs").Append("cookies").Append("management");
- ListBuilder required_permissions;
+ auto optional_permissions =
+ base::Value::List().Append("tabs").Append("cookies").Append(
+ "management");
+ base::Value::List required_permissions;
required_permissions.Append("topSites");
scoped_refptr<const Extension> extension =
- CreateExtensionWithOptionalPermissions(optional_permissions.Build(),
- required_permissions.Build(),
+ CreateExtensionWithOptionalPermissions(std::move(optional_permissions),
+ std::move(required_permissions),
"My Extension");
PermissionsUpdater updater(profile());
@@ -279,12 +277,12 @@
URLPatternSet default_policy_allowed_hosts;
URLPatternSet policy_blocked_hosts;
URLPatternSet policy_allowed_hosts;
- ListBuilder optional_permissions;
- ListBuilder required_permissions;
- required_permissions.Append("tabs").Append("http://*/*");
+ base::Value::List optional_permissions;
+ base::Value::List required_permissions =
+ base::Value::List().Append("tabs").Append("http://*/*");
scoped_refptr<const Extension> extension =
- CreateExtensionWithOptionalPermissions(optional_permissions.Build(),
- required_permissions.Build(),
+ CreateExtensionWithOptionalPermissions(std::move(optional_permissions),
+ std::move(required_permissions),
"ExtensionSettings");
AddPattern(&default_policy_blocked_hosts, "http://*.google.com/*");
PermissionsUpdater updater(profile());
@@ -379,7 +377,7 @@
scoped_refptr<const Extension> extension =
ExtensionBuilder("extension")
.SetManifestKey("optional_permissions",
- extensions::ListBuilder().Append("tabs").Build())
+ base::Value::List().Append("tabs"))
.Build();
PermissionsUpdater updater(profile());
@@ -504,7 +502,7 @@
scoped_refptr<const Extension> extension =
CreateExtensionWithOptionalPermissions(
base::Value::List(),
- ListBuilder().Append(test_case.permission).Build(), test_name);
+ base::Value::List().Append(test_case.permission), test_name);
PermissionsUpdater updater(profile());
updater.InitializePermissions(extension.get());
@@ -763,9 +761,9 @@
scoped_refptr<const Extension> extension =
CreateExtensionWithOptionalPermissions(
- /*optional_permissions=*/ListBuilder().Append("tabs").Build(),
+ /*optional_permissions=*/base::Value::List().Append("tabs"),
/*permissions=*/
- ListBuilder().Append("https://example.com/*").Build(),
+ base::Value::List().Append("https://example.com/*"),
"optional grant");
ASSERT_TRUE(extension);
diff --git a/chrome/browser/extensions/service_worker_apitest.cc b/chrome/browser/extensions/service_worker_apitest.cc
index 26bf3c7e..57dc4ba 100644
--- a/chrome/browser/extensions/service_worker_apitest.cc
+++ b/chrome/browser/extensions/service_worker_apitest.cc
@@ -19,6 +19,7 @@
#include "base/test/metrics/histogram_tester.h"
#include "base/test/scoped_feature_list.h"
#include "base/threading/thread_restrictions.h"
+#include "base/values.h"
#include "build/build_config.h"
#include "chrome/browser/extensions/api/permissions/permissions_api.h"
#include "chrome/browser/extensions/browsertest_util.h"
@@ -79,7 +80,6 @@
#include "extensions/common/manifest_handlers/background_info.h"
#include "extensions/common/mojom/event_dispatcher.mojom.h"
#include "extensions/common/permissions/permissions_data.h"
-#include "extensions/common/value_builder.h"
#include "extensions/common/verifier_formats.h"
#include "extensions/test/extension_background_page_waiter.h"
#include "extensions/test/extension_test_message_listener.h"
diff --git a/chrome/browser/extensions/shared_module_service_unittest.cc b/chrome/browser/extensions/shared_module_service_unittest.cc
index 8b2f632d..78bd9aa4 100644
--- a/chrome/browser/extensions/shared_module_service_unittest.cc
+++ b/chrome/browser/extensions/shared_module_service_unittest.cc
@@ -21,7 +21,6 @@
#include "extensions/browser/uninstall_reason.h"
#include "extensions/common/extension_builder.h"
#include "extensions/common/features/feature_channel.h"
-#include "extensions/common/value_builder.h"
namespace extensions {
@@ -33,18 +32,18 @@
const std::vector<std::string>& import_ids,
const std::string& id,
const std::string& version) {
- DictionaryBuilder builder;
- builder.Set("name", "Has Dependent Modules")
- .Set("version", version)
- .Set("manifest_version", 2);
+ auto builder = base::Value::Dict()
+ .Set("name", "Has Dependent Modules")
+ .Set("version", version)
+ .Set("manifest_version", 2);
if (!import_ids.empty()) {
- ListBuilder import_list;
+ base::Value::List import_list;
for (const std::string& import_id : import_ids)
- import_list.Append(DictionaryBuilder().Set("id", import_id).Build());
- builder.Set("import", import_list.Build());
+ import_list.Append(base::Value::Dict().Set("id", import_id));
+ builder.Set("import", std::move(import_list));
}
return ExtensionBuilder()
- .SetManifest(builder.Build())
+ .SetManifest(std::move(builder))
.AddFlags(Extension::FROM_WEBSTORE)
.SetID(id)
.Build();
@@ -53,15 +52,13 @@
scoped_refptr<const Extension> CreateSharedModule(
const std::string& module_id) {
base::Value::Dict manifest =
- DictionaryBuilder()
+ base::Value::Dict()
.Set("name", "Shared Module")
.Set("version", "1.0")
.Set("manifest_version", 2)
.Set("export",
- DictionaryBuilder()
- .Set("resources", ListBuilder().Append("foo.js").Build())
- .Build())
- .Build();
+ base::Value::Dict().Set("resources",
+ base::Value::List().Append("foo.js")));
return ExtensionBuilder()
.SetManifest(std::move(manifest))
@@ -179,15 +176,13 @@
EXPECT_TRUE(InstallExtension(shared_module_1.get(), false));
base::Value::Dict manifest_2 =
- DictionaryBuilder()
+ base::Value::Dict()
.Set("name", "Shared Module 2")
.Set("version", "1.0")
.Set("manifest_version", 2)
.Set("export",
- DictionaryBuilder()
- .Set("resources", ListBuilder().Append("foo.js").Build())
- .Build())
- .Build();
+ base::Value::Dict().Set("resources",
+ base::Value::List().Append("foo.js")));
scoped_refptr<const Extension> shared_module_2 =
CreateSharedModule("shared_module_2");
EXPECT_TRUE(InstallExtension(shared_module_2.get(), false));
@@ -238,17 +233,14 @@
crx_file::id_util::GenerateId("nonallowlisted");
// Create a module which exports to a restricted allowlist.
base::Value::Dict manifest =
- DictionaryBuilder()
+ base::Value::Dict()
.Set("name", "Shared Module")
.Set("version", "1.0")
.Set("manifest_version", 2)
.Set("export",
- DictionaryBuilder()
- .Set("allowlist",
- ListBuilder().Append(allowlisted_id).Build())
- .Set("resources", ListBuilder().Append("*").Build())
- .Build())
- .Build();
+ base::Value::Dict()
+ .Set("allowlist", base::Value::List().Append(allowlisted_id))
+ .Set("resources", base::Value::List().Append("*")));
scoped_refptr<const Extension> shared_module =
ExtensionBuilder()
.SetManifest(std::move(manifest))
diff --git a/chrome/browser/extensions/test_extension_environment.cc b/chrome/browser/extensions/test_extension_environment.cc
index 7f7499e..d98a179 100644
--- a/chrome/browser/extensions/test_extension_environment.cc
+++ b/chrome/browser/extensions/test_extension_environment.cc
@@ -20,7 +20,6 @@
#include "content/public/test/web_contents_tester.h"
#include "extensions/browser/extension_prefs.h"
#include "extensions/common/extension_builder.h"
-#include "extensions/common/value_builder.h"
#include "testing/gtest/include/gtest/gtest.h"
#if BUILDFLAG(IS_CHROMEOS_ASH)
@@ -37,29 +36,24 @@
base::Value::Dict MakeExtensionManifest(
const base::Value::Dict& manifest_extra) {
- base::Value::Dict manifest = DictionaryBuilder()
+ base::Value::Dict manifest = base::Value::Dict()
.Set("name", "Extension")
.Set("version", "1.0")
- .Set("manifest_version", 2)
- .Build();
+ .Set("manifest_version", 2);
manifest.Merge(manifest_extra.Clone());
return manifest;
}
base::Value::Dict MakePackagedAppManifest() {
- return extensions::DictionaryBuilder()
+ return base::Value::Dict()
.Set("name", "Test App Name")
.Set("version", "2.0")
.Set("manifest_version", 2)
- .Set("app", extensions::DictionaryBuilder()
- .Set("background",
- extensions::DictionaryBuilder()
- .Set("scripts", extensions::ListBuilder()
- .Append("background.js")
- .Build())
- .Build())
- .Build())
- .Build();
+ .Set("app",
+ base::Value::Dict().Set(
+ "background",
+ base::Value::Dict().Set(
+ "scripts", base::Value::List().Append("background.js"))));
}
} // namespace
diff --git a/chrome/browser/extensions/update_install_gate_unittest.cc b/chrome/browser/extensions/update_install_gate_unittest.cc
index 36cf733a..d1395b18 100644
--- a/chrome/browser/extensions/update_install_gate_unittest.cc
+++ b/chrome/browser/extensions/update_install_gate_unittest.cc
@@ -11,6 +11,7 @@
#include "base/memory/ptr_util.h"
#include "base/memory/raw_ptr.h"
#include "base/run_loop.h"
+#include "base/values.h"
#include "build/chromeos_buildflags.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/test_extension_system.h"
@@ -27,7 +28,6 @@
#include "extensions/browser/extension_registry.h"
#include "extensions/common/extension_builder.h"
#include "extensions/common/manifest_handlers/background_info.h"
-#include "extensions/common/value_builder.h"
#include "testing/gtest/include/gtest/gtest.h"
#if BUILDFLAG(IS_CHROMEOS_ASH)
@@ -53,20 +53,15 @@
scoped_refptr<const Extension> app =
ExtensionBuilder()
.SetManifest(
- DictionaryBuilder()
+ base::Value::Dict()
.Set("name", "Test app")
.Set("version", version)
.Set("manifest_version", 2)
- .Set("app",
- DictionaryBuilder()
- .Set("background",
- DictionaryBuilder()
- .Set("scripts", ListBuilder()
- .Append("background.js")
- .Build())
- .Build())
- .Build())
- .Build())
+ .Set("app", base::Value::Dict().Set(
+ "background",
+ base::Value::Dict().Set(
+ "scripts", base::Value::List().Append(
+ "background.js")))))
.SetID(extension_id)
.Build();
return app;
@@ -78,15 +73,13 @@
scoped_refptr<const Extension> extension =
ExtensionBuilder()
.SetManifest(
- DictionaryBuilder()
+ base::Value::Dict()
.Set("name", "Test extension")
.Set("version", version)
.Set("manifest_version", 2)
- .Set("background", DictionaryBuilder()
+ .Set("background", base::Value::Dict()
.Set("page", "background.html")
- .Set("persistent", persistent)
- .Build())
- .Build())
+ .Set("persistent", persistent)))
.SetID(extension_id)
.Build();
return extension;
diff --git a/chrome/browser/extensions/webstore_installer_browsertest.cc b/chrome/browser/extensions/webstore_installer_browsertest.cc
index d7d02c16..3243582 100644
--- a/chrome/browser/extensions/webstore_installer_browsertest.cc
+++ b/chrome/browser/extensions/webstore_installer_browsertest.cc
@@ -18,7 +18,6 @@
#include "extensions/common/extension.h"
#include "extensions/common/extension_builder.h"
#include "extensions/common/extension_features.h"
-#include "extensions/common/value_builder.h"
namespace extensions {
@@ -122,12 +121,11 @@
// The manifest used by the test installer must match `kCrxFilename` manifest
// in the test directory.
base::Value::Dict GetManifest() {
- return DictionaryBuilder()
+ return base::Value::Dict()
.Set("name", "Installer Extension")
.Set("manifest_version", 2)
.Set("version", "1.0")
- .Set("permissions", ListBuilder().Append("tabs").Build())
- .Build();
+ .Set("permissions", base::Value::List().Append("tabs"));
}
};
@@ -218,12 +216,11 @@
// Th manifest used by the test installer must match
// `kCrxWithPermissionsFilename` manifest in the test directory.
base::Value::Dict GetManifest() {
- return DictionaryBuilder()
+ return base::Value::Dict()
.Set("name", "Installer Extension")
.Set("manifest_version", 3)
.Set("version", "1.0")
- .Set("host_permissions", ListBuilder().Append("<all_urls>").Build())
- .Build();
+ .Set("host_permissions", base::Value::List().Append("<all_urls>"));
}
private:
diff --git a/chrome/browser/extensions/webstore_reinstaller_browsertest.cc b/chrome/browser/extensions/webstore_reinstaller_browsertest.cc
index 3e7ed79..d93c7a06 100644
--- a/chrome/browser/extensions/webstore_reinstaller_browsertest.cc
+++ b/chrome/browser/extensions/webstore_reinstaller_browsertest.cc
@@ -4,6 +4,7 @@
#include "base/functional/bind.h"
#include "base/run_loop.h"
+#include "base/values.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/webstore_installer_test.h"
#include "chrome/browser/extensions/webstore_reinstaller.h"
@@ -14,7 +15,6 @@
#include "extensions/browser/extension_registry.h"
#include "extensions/common/extension.h"
#include "extensions/common/extension_builder.h"
-#include "extensions/common/value_builder.h"
namespace extensions {
@@ -67,12 +67,11 @@
ExtensionBuilder()
.SetLocation(mojom::ManifestLocation::kInternal)
.SetID(kTestExtensionId)
- .SetManifest(DictionaryBuilder()
+ .SetManifest(base::Value::Dict()
.Set("name", kExtensionName)
.Set("description", "Foo")
.Set("manifest_version", 2)
- .Set("version", "1.0")
- .Build())
+ .Set("version", "1.0"))
.Build();
extension_service()->AddExtension(extension.get());
ExtensionRegistry* registry = ExtensionRegistry::Get(profile());
