Replace deprecated ListValue::GetString() in chrome/browser/ui/webui/settings.
Bug: 1187090
Change-Id: Iae2747922b712d649e75a24329117f8b14d46316
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3212216
Reviewed-by: Regan Hsu <hsuregan@chromium.org>
Reviewed-by: dpapad <dpapad@chromium.org>
Commit-Queue: Brian Begnoche <bcb@chromium.org>
Cr-Commit-Position: refs/heads/main@{#933887}
diff --git a/chrome/browser/ui/webui/settings/about_handler.cc b/chrome/browser/ui/webui/settings/about_handler.cc
index 777be39..6908e13d 100644
--- a/chrome/browser/ui/webui/settings/about_handler.cc
+++ b/chrome/browser/ui/webui/settings/about_handler.cc
@@ -443,8 +443,7 @@
void AboutHandler::HandleCheckInternetConnection(const base::ListValue* args) {
CHECK_EQ(1U, args->GetList().size());
- std::string callback_id;
- CHECK(args->GetString(0, &callback_id));
+ const std::string& callback_id = args->GetList()[0].GetString();
chromeos::NetworkStateHandler* network_state_handler =
chromeos::NetworkHandler::Get()->network_state_handler();
@@ -478,17 +477,14 @@
return;
}
- std::u16string channel;
- bool is_powerwash_allowed = false;
- if (args->GetString(0, &channel) && args->GetList()[1].is_bool()) {
- is_powerwash_allowed = args->GetList()[1].GetBool();
- } else {
+ if (!args->GetList()[0].is_string() || !args->GetList()[1].is_bool()) {
LOG(ERROR) << "Can't parse SetChannel() args";
return;
}
+ const std::string& channel = args->GetList()[0].GetString();
+ const bool& is_powerwash_allowed = args->GetList()[1].GetBool();
- version_updater_->SetChannel(base::UTF16ToUTF8(channel),
- is_powerwash_allowed);
+ version_updater_->SetChannel(channel, is_powerwash_allowed);
if (user_manager::UserManager::Get()->IsCurrentUserOwner()) {
// Check for update after switching release channel.
version_updater_->CheckForUpdate(
@@ -500,8 +496,7 @@
void AboutHandler::HandleGetVersionInfo(const base::ListValue* args) {
CHECK_EQ(1U, args->GetList().size());
- std::string callback_id;
- CHECK(args->GetString(0, &callback_id));
+ const std::string& callback_id = args->GetList()[0].GetString();
base::ThreadPool::PostTaskAndReplyWithResult(
FROM_HERE, {base::MayBlock(), base::TaskPriority::USER_VISIBLE},
base::BindOnce(&GetVersionInfo),
@@ -517,8 +512,7 @@
void AboutHandler::HandleGetRegulatoryInfo(const base::ListValue* args) {
CHECK_EQ(1U, args->GetList().size());
- std::string callback_id;
- CHECK(args->GetString(0, &callback_id));
+ const std::string& callback_id = args->GetList()[0].GetString();
base::ThreadPool::PostTaskAndReplyWithResult(
FROM_HERE, {base::MayBlock(), base::TaskPriority::USER_VISIBLE},
@@ -529,8 +523,7 @@
void AboutHandler::HandleGetChannelInfo(const base::ListValue* args) {
CHECK_EQ(1U, args->GetList().size());
- std::string callback_id;
- CHECK(args->GetString(0, &callback_id));
+ const std::string& callback_id = args->GetList()[0].GetString();
version_updater_->GetChannel(
true /* get current channel */,
base::BindOnce(&AboutHandler::OnGetCurrentChannel,
@@ -539,8 +532,7 @@
void AboutHandler::HandleCanChangeChannel(const base::ListValue* args) {
CHECK_EQ(1U, args->GetList().size());
- std::string callback_id;
- CHECK(args->GetString(0, &callback_id));
+ const std::string& callback_id = args->GetList()[0].GetString();
ResolveJavascriptCallback(base::Value(callback_id),
base::Value(CanChangeChannel(profile_)));
}
@@ -579,12 +571,9 @@
const base::ListValue* args) {
CHECK_EQ(2U, args->GetList().size());
- std::string update_version;
- std::string update_size_string;
+ const std::string& update_version = args->GetList()[0].GetString();
+ const std::string& update_size_string = args->GetList()[1].GetString();
int64_t update_size;
-
- CHECK(args->GetString(0, &update_version));
- CHECK(args->GetString(1, &update_size_string));
CHECK(base::StringToInt64(update_size_string, &update_size));
RequestUpdateOverCellular(update_version, update_size);
@@ -615,8 +604,7 @@
void AboutHandler::HandleGetEndOfLifeInfo(const base::ListValue* args) {
CHECK_EQ(1U, args->GetList().size());
- std::string callback_id;
- CHECK(args->GetString(0, &callback_id));
+ const std::string& callback_id = args->GetList()[0].GetString();
version_updater_->GetEolInfo(base::BindOnce(&AboutHandler::OnGetEndOfLifeInfo,
weak_factory_.GetWeakPtr(),
callback_id));
diff --git a/chrome/browser/ui/webui/settings/chromeos/bluetooth_handler.cc b/chrome/browser/ui/webui/settings/chromeos/bluetooth_handler.cc
index dc855bc..752d4c6 100644
--- a/chrome/browser/ui/webui/settings/chromeos/bluetooth_handler.cc
+++ b/chrome/browser/ui/webui/settings/chromeos/bluetooth_handler.cc
@@ -47,11 +47,9 @@
void BluetoothHandler::HandleIsDeviceBlockedByPolicy(
const base::ListValue* args) {
AllowJavascript();
- std::string callback_id;
- std::string address;
CHECK_EQ(2U, args->GetList().size());
- CHECK(args->GetString(0, &callback_id));
- CHECK(args->GetString(1, &address));
+ const std::string& callback_id = args->GetList()[0].GetString();
+ const std::string& address = args->GetList()[1].GetString();
if (!bluetooth_adapter_) {
BLUETOOTH_LOG(EVENT) << "Bluetooth adapter not available.";
diff --git a/chrome/browser/ui/webui/settings/chromeos/change_picture_handler.cc b/chrome/browser/ui/webui/settings/chromeos/change_picture_handler.cc
index 7af6ba2..2c35fe7 100644
--- a/chrome/browser/ui/webui/settings/chromeos/change_picture_handler.cc
+++ b/chrome/browser/ui/webui/settings/chromeos/change_picture_handler.cc
@@ -194,9 +194,9 @@
AccessibilityManager::Get()->PlayEarcon(
Sound::kCameraSnap, PlaySoundOption::kOnlyIfSpokenFeedbackEnabled);
- std::string image_url;
- if (!args || args->GetList().size() != 1 || !args->GetString(0, &image_url))
+ if (!args || args->GetList().size() != 1 || !args->GetList()[0].is_string())
NOTREACHED();
+ const std::string& image_url = args->GetList()[0].GetString();
DCHECK(!image_url.empty());
std::string raw_data;
@@ -314,13 +314,13 @@
}
void ChangePictureHandler::HandleSelectImage(const base::ListValue* args) {
- std::string image_url;
- std::string image_type;
- if (!args || args->GetList().size() != 2 || !args->GetString(0, &image_url) ||
- !args->GetString(1, &image_type)) {
+ if (!args || args->GetList().size() != 2 || !args->GetList()[0].is_string() ||
+ !args->GetList()[1].is_string()) {
NOTREACHED();
return;
}
+ const std::string& image_url = args->GetList()[0].GetString();
+ const std::string& image_type = args->GetList()[1].GetString();
// |image_url| may be empty unless |image_type| is "default".
DCHECK(!image_type.empty());
diff --git a/chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.cc b/chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.cc
index 87f3b0e..09878ed2 100644
--- a/chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.cc
+++ b/chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.cc
@@ -374,8 +374,7 @@
AllowJavascript();
CHECK_EQ(1U, args->GetList().size());
- std::string callback_id;
- CHECK(args->GetString(0, &callback_id));
+ const std::string& callback_id = args->GetList()[0].GetString();
std::vector<Printer> printers =
printers_manager_->GetPrinters(PrinterClass::kSaved);
@@ -399,13 +398,10 @@
}
void CupsPrintersHandler::HandleUpdateCupsPrinter(const base::ListValue* args) {
- std::string callback_id;
- std::string printer_id;
- std::string printer_name;
CHECK_EQ(3U, args->GetList().size());
- CHECK(args->GetString(0, &callback_id));
- CHECK(args->GetString(1, &printer_id));
- CHECK(args->GetString(2, &printer_name));
+ const std::string& callback_id = args->GetList()[0].GetString();
+ const std::string& printer_id = args->GetList()[1].GetString();
+ const std::string& printer_name = args->GetList()[2].GetString();
Printer printer(printer_id);
printer.set_display_name(printer_name);
@@ -429,10 +425,8 @@
void CupsPrintersHandler::HandleRemoveCupsPrinter(const base::ListValue* args) {
PRINTER_LOG(USER) << "Removing printer";
- std::string printer_id;
- std::string printer_name;
- CHECK(args->GetString(0, &printer_id));
- CHECK(args->GetString(1, &printer_name));
+ // Printer name also expected in 2nd parameter.
+ const std::string& printer_id = args->GetList()[0].GetString();
auto printer = printers_manager_->GetPrinter(printer_id);
if (!printer)
return;
@@ -453,11 +447,11 @@
void CupsPrintersHandler::HandleGetPrinterInfo(const base::ListValue* args) {
DCHECK(args);
- std::string callback_id;
- if (!args->GetString(0, &callback_id)) {
+ if (args->GetList().empty() || !args->GetList()[0].is_string()) {
NOTREACHED() << "Expected request for a promise";
return;
}
+ const std::string& callback_id = args->GetList()[0].GetString();
const base::DictionaryValue* printer_dict = nullptr;
if (!args->GetDictionary(1, &printer_dict)) {
@@ -836,9 +830,8 @@
void CupsPrintersHandler::HandleGetCupsPrinterManufacturers(
const base::ListValue* args) {
AllowJavascript();
- std::string callback_id;
CHECK_EQ(1U, args->GetList().size());
- CHECK(args->GetString(0, &callback_id));
+ const std::string& callback_id = args->GetList()[0].GetString();
ppd_provider_->ResolveManufacturers(
base::BindOnce(&CupsPrintersHandler::ResolveManufacturersDone,
weak_factory_.GetWeakPtr(), callback_id));
@@ -847,11 +840,9 @@
void CupsPrintersHandler::HandleGetCupsPrinterModels(
const base::ListValue* args) {
AllowJavascript();
- std::string callback_id;
- std::string manufacturer;
CHECK_EQ(2U, args->GetList().size());
- CHECK(args->GetString(0, &callback_id));
- CHECK(args->GetString(1, &manufacturer));
+ const std::string& callback_id = args->GetList()[0].GetString();
+ const std::string& manufacturer = args->GetList()[1].GetString();
// Empty manufacturer queries may be triggered as a part of the ui
// initialization, and should just return empty results.
@@ -871,7 +862,7 @@
void CupsPrintersHandler::HandleSelectPPDFile(const base::ListValue* args) {
CHECK_EQ(1U, args->GetList().size());
- CHECK(args->GetString(0, &webui_callback_id_));
+ webui_callback_id_ = args->GetList()[0].GetString();
base::FilePath downloads_path =
DownloadPrefs::FromDownloadManager(profile_->GetDownloadManager())
@@ -1048,10 +1039,8 @@
const base::ListValue* args) {
AllowJavascript();
CHECK_EQ(2U, args->GetList().size());
- std::string callback_id;
- std::string printer_id;
- CHECK(args->GetString(0, &callback_id));
- CHECK(args->GetString(1, &printer_id));
+ const std::string& callback_id = args->GetList()[0].GetString();
+ const std::string& printer_id = args->GetList()[1].GetString();
PRINTER_LOG(USER) << "Adding discovered printer";
absl::optional<Printer> printer = printers_manager_->GetPrinter(printer_id);
@@ -1114,10 +1103,8 @@
const base::ListValue* args) {
AllowJavascript();
CHECK_EQ(2U, args->GetList().size());
- std::string callback_id;
- CHECK(args->GetString(0, &callback_id));
- std::string printer_id;
- CHECK(args->GetString(1, &printer_id));
+ const std::string& callback_id = args->GetList()[0].GetString();
+ const std::string& printer_id = args->GetList()[1].GetString();
auto printer = printers_manager_->GetPrinter(printer_id);
if (!printer) {
@@ -1225,11 +1212,9 @@
}
void CupsPrintersHandler::HandleQueryPrintServer(const base::ListValue* args) {
- std::string callback_id;
- std::string server_url;
CHECK_EQ(2U, args->GetList().size());
- CHECK(args->GetString(0, &callback_id));
- CHECK(args->GetString(1, &server_url));
+ const std::string& callback_id = args->GetList()[0].GetString();
+ const std::string& server_url = args->GetList()[1].GetString();
absl::optional<GURL> converted_server_url =
GenerateServerPrinterUrlWithValidScheme(server_url);
diff --git a/chrome/browser/ui/webui/settings/chromeos/device_display_handler.cc b/chrome/browser/ui/webui/settings/chromeos/device_display_handler.cc
index 32bf367..b1545481 100644
--- a/chrome/browser/ui/webui/settings/chromeos/device_display_handler.cc
+++ b/chrome/browser/ui/webui/settings/chromeos/device_display_handler.cc
@@ -38,11 +38,10 @@
void DisplayHandler::HandleHighlightDisplay(const base::ListValue* args) {
AllowJavascript();
- std::string display_id_str;
int64_t display_id;
- if (!args->GetString(0, &display_id_str) ||
- !base::StringToInt64(display_id_str, &display_id)) {
+ if (args->GetList().empty() || !args->GetList()[0].is_string() ||
+ !base::StringToInt64(args->GetList()[0].GetString(), &display_id)) {
cros_display_config_->HighlightDisplay(display::kInvalidDisplayId);
return;
}
diff --git a/chrome/browser/ui/webui/settings/chromeos/device_power_handler.cc b/chrome/browser/ui/webui/settings/chromeos/device_power_handler.cc
index b2d4a21d..e0ad3a4 100644
--- a/chrome/browser/ui/webui/settings/chromeos/device_power_handler.cc
+++ b/chrome/browser/ui/webui/settings/chromeos/device_power_handler.cc
@@ -217,8 +217,7 @@
void PowerHandler::HandleSetPowerSource(const base::ListValue* args) {
AllowJavascript();
- std::string id;
- CHECK(args->GetString(0, &id));
+ const std::string& id = args->GetList()[0].GetString();
chromeos::PowerManagerClient::Get()->SetPowerSource(id);
}
diff --git a/chrome/browser/ui/webui/settings/chromeos/device_stylus_handler.cc b/chrome/browser/ui/webui/settings/chromeos/device_stylus_handler.cc
index 62a907c0..981bd0d 100644
--- a/chrome/browser/ui/webui/settings/chromeos/device_stylus_handler.cc
+++ b/chrome/browser/ui/webui/settings/chromeos/device_stylus_handler.cc
@@ -121,8 +121,7 @@
void StylusHandler::HandleSetPreferredNoteTakingApp(
const base::ListValue* args) {
- std::string app_id;
- CHECK(args->GetString(0, &app_id));
+ const std::string& app_id = args->GetList()[0].GetString();
// Sanity check: make sure that the ID we got back from WebUI is in the
// currently-available set.
@@ -158,8 +157,8 @@
}
void StylusHandler::HandleShowPlayStoreApps(const base::ListValue* args) {
- std::string apps_url;
- args->GetString(0, &apps_url);
+ const std::string& apps_url =
+ !args->GetList().empty() ? args->GetList()[0].GetString() : "";
Profile* profile = Profile::FromWebUI(web_ui());
if (!arc::IsArcAllowedForProfile(profile)) {
VLOG(1) << "ARC is not enabled for this profile";
diff --git a/chrome/browser/ui/webui/settings/chromeos/fingerprint_handler.cc b/chrome/browser/ui/webui/settings/chromeos/fingerprint_handler.cc
index 146f8d0..0796edd 100644
--- a/chrome/browser/ui/webui/settings/chromeos/fingerprint_handler.cc
+++ b/chrome/browser/ui/webui/settings/chromeos/fingerprint_handler.cc
@@ -177,8 +177,7 @@
void FingerprintHandler::HandleGetFingerprintsList(
const base::ListValue* args) {
CHECK_EQ(1U, args->GetList().size());
- std::string callback_id;
- CHECK(args->GetString(0, &callback_id));
+ const std::string& callback_id = args->GetList()[0].GetString();
AllowJavascript();
fp_service_->GetRecordsForUser(
@@ -207,8 +206,7 @@
void FingerprintHandler::HandleGetNumFingerprints(const base::ListValue* args) {
CHECK_EQ(1U, args->GetList().size());
- std::string callback_id;
- CHECK(args->GetString(0, &callback_id));
+ const std::string& callback_id = args->GetList()[0].GetString();
int fingerprints_num =
profile_->GetPrefs()->GetInteger(prefs::kQuickUnlockFingerprintRecord);
@@ -221,8 +219,7 @@
void FingerprintHandler::HandleStartEnroll(const base::ListValue* args) {
AllowJavascript();
- std::string auth_token;
- CHECK(args->GetString(0, &auth_token));
+ const std::string& auth_token = args->GetList()[0].GetString();
// Auth token expiration will trigger password prompt.
// Silently fail if auth token is incorrect.
diff --git a/chrome/browser/ui/webui/settings/chromeos/internet_handler.cc b/chrome/browser/ui/webui/settings/chromeos/internet_handler.cc
index 4bf3ce3..e446623 100644
--- a/chrome/browser/ui/webui/settings/chromeos/internet_handler.cc
+++ b/chrome/browser/ui/webui/settings/chromeos/internet_handler.cc
@@ -110,11 +110,11 @@
}
void InternetHandler::AddThirdPartyVpn(const base::ListValue* args) {
- std::string app_id;
- if (args->GetList().size() < 1 || !args->GetString(0, &app_id)) {
+ if (args->GetList().size() < 1 || !args->GetList()[0].is_string()) {
NOTREACHED() << "Invalid args for: " << kAddThirdPartyVpnMessage;
return;
}
+ const std::string& app_id = args->GetList()[0].GetString();
if (app_id.empty()) {
NET_LOG(ERROR) << "Empty app id for " << kAddThirdPartyVpnMessage;
return;
@@ -146,11 +146,11 @@
}
void InternetHandler::ConfigureThirdPartyVpn(const base::ListValue* args) {
- std::string guid;
- if (args->GetList().size() < 1 || !args->GetString(0, &guid)) {
+ if (args->GetList().size() < 1 || !args->GetList()[0].is_string()) {
NOTREACHED() << "Invalid args for: " << kConfigureThirdPartyVpnMessage;
return;
}
+ const std::string& guid = args->GetList()[0].GetString();
if (profile_ != GetProfileForPrimaryUser()) {
NET_LOG(ERROR) << "Only the primary user can configure VPNs";
return;
@@ -206,20 +206,20 @@
}
void InternetHandler::ShowCarrierAccountDetail(const base::ListValue* args) {
- std::string guid;
- if (args->GetList().size() < 1 || !args->GetString(0, &guid)) {
+ if (args->GetList().size() < 1 || !args->GetList()[0].is_string()) {
NOTREACHED() << "Invalid args for: " << kShowCarrierAccountDetail;
return;
}
+ const std::string& guid = args->GetList()[0].GetString();
chromeos::NetworkConnect::Get()->ShowCarrierAccountDetail(guid);
}
void InternetHandler::ShowCellularSetupUI(const base::ListValue* args) {
- std::string guid;
- if (args->GetList().size() < 1 || !args->GetString(0, &guid)) {
+ if (args->GetList().size() < 1 || !args->GetList()[0].is_string()) {
NOTREACHED() << "Invalid args for: " << kConfigureThirdPartyVpnMessage;
return;
}
+ const std::string& guid = args->GetList()[0].GetString();
chromeos::NetworkConnect::Get()->ShowMobileSetup(guid);
}
diff --git a/chrome/browser/ui/webui/settings/chromeos/multidevice_handler.cc b/chrome/browser/ui/webui/settings/chromeos/multidevice_handler.cc
index 214076d..3a3551e9 100644
--- a/chrome/browser/ui/webui/settings/chromeos/multidevice_handler.cc
+++ b/chrome/browser/ui/webui/settings/chromeos/multidevice_handler.cc
@@ -279,9 +279,8 @@
// loaded, so it should be the one to allow JS calls.
AllowJavascript();
- std::string callback_id;
- bool result = args->GetString(0, &callback_id);
- DCHECK(result);
+ const base::Value& callback_id = args->GetList()[0];
+ DCHECK(callback_id.is_string());
std::unique_ptr<base::DictionaryValue> page_content_dictionary =
GeneratePageContentDataDictionary();
@@ -289,7 +288,7 @@
PA_LOG(INFO) << "Responding to getPageContentData() request with: "
<< *page_content_dictionary << ".";
- ResolveJavascriptCallback(base::Value(callback_id), *page_content_dictionary);
+ ResolveJavascriptCallback(callback_id, *page_content_dictionary);
}
void MultideviceHandler::HandleSetFeatureEnabledState(
@@ -339,13 +338,12 @@
void MultideviceHandler::HandleGetSmartLockSignInEnabled(
const base::ListValue* args) {
- std::string callback_id;
- CHECK(args->GetString(0, &callback_id));
+ const base::Value& callback_id = args->GetList()[0];
+ CHECK(callback_id.is_string());
bool signInEnabled = prefs_->GetBoolean(
proximity_auth::prefs::kProximityAuthIsChromeOSLoginEnabled);
- ResolveJavascriptCallback(base::Value(callback_id),
- base::Value(signInEnabled));
+ ResolveJavascriptCallback(callback_id, base::Value(signInEnabled));
}
void MultideviceHandler::HandleSetSmartLockSignInEnabled(
@@ -354,8 +352,10 @@
if (args->GetList()[0].is_bool())
enabled = args->GetList()[0].GetBool();
- std::string auth_token;
- bool auth_token_present = args->GetString(1, &auth_token);
+ const bool auth_token_present =
+ args->GetList().size() >= 2 && args->GetList()[1].is_string();
+ const std::string& auth_token =
+ auth_token_present ? args->GetList()[1].GetString() : "";
// Either the user is disabling sign-in, or they are enabling it and the auth
// token must be present.
@@ -371,13 +371,12 @@
void MultideviceHandler::HandleGetSmartLockSignInAllowed(
const base::ListValue* args) {
- std::string callback_id;
- CHECK(args->GetString(0, &callback_id));
+ const base::Value& callback_id = args->GetList()[0];
+ CHECK(callback_id.is_string());
bool sign_in_allowed =
prefs_->GetBoolean(multidevice_setup::kSmartLockSigninAllowedPrefName);
- ResolveJavascriptCallback(base::Value(callback_id),
- base::Value(sign_in_allowed));
+ ResolveJavascriptCallback(callback_id, base::Value(sign_in_allowed));
}
std::unique_ptr<base::DictionaryValue>
@@ -407,11 +406,9 @@
}
void MultideviceHandler::HandleGetAndroidSmsInfo(const base::ListValue* args) {
- CHECK_EQ(1U, args->GetList().size());
- const base::Value* callback_id;
- CHECK(args->Get(0, &callback_id));
+ const base::Value& callback_id = args->GetList()[0];
- ResolveJavascriptCallback(*callback_id, *GenerateAndroidSmsInfo());
+ ResolveJavascriptCallback(callback_id, *GenerateAndroidSmsInfo());
}
void MultideviceHandler::HandleAttemptNotificationSetup(
diff --git a/chrome/browser/ui/webui/settings/chromeos/tts_handler.cc b/chrome/browser/ui/webui/settings/chromeos/tts_handler.cc
index eb38d3a..9609589 100644
--- a/chrome/browser/ui/webui/settings/chromeos/tts_handler.cc
+++ b/chrome/browser/ui/webui/settings/chromeos/tts_handler.cc
@@ -125,10 +125,8 @@
void TtsHandler::HandlePreviewTtsVoice(const base::ListValue* args) {
DCHECK_EQ(2U, args->GetList().size());
- std::string text;
- std::string voice_id;
- args->GetString(0, &text);
- args->GetString(1, &voice_id);
+ const std::string& text = args->GetList()[0].GetString();
+ const std::string& voice_id = args->GetList()[1].GetString();
if (text.empty() || voice_id.empty())
return;
diff --git a/chrome/browser/ui/webui/settings/downloads_handler.cc b/chrome/browser/ui/webui/settings/downloads_handler.cc
index 6a2e31e..69a5937 100644
--- a/chrome/browser/ui/webui/settings/downloads_handler.cc
+++ b/chrome/browser/ui/webui/settings/downloads_handler.cc
@@ -146,10 +146,8 @@
const base::ListValue* args) {
AllowJavascript();
CHECK_EQ(2U, args->GetList().size());
- std::string callback_id;
- std::string path;
- CHECK(args->GetString(0, &callback_id));
- CHECK(args->GetString(1, &path));
+ const std::string& callback_id = args->GetList()[0].GetString();
+ const std::string& path = args->GetList()[1].GetString();
ResolveJavascriptCallback(
base::Value(callback_id),
diff --git a/chrome/browser/ui/webui/settings/extension_control_handler.cc b/chrome/browser/ui/webui/settings/extension_control_handler.cc
index 12620c2..8845449 100644
--- a/chrome/browser/ui/webui/settings/extension_control_handler.cc
+++ b/chrome/browser/ui/webui/settings/extension_control_handler.cc
@@ -27,8 +27,7 @@
void ExtensionControlHandler::HandleDisableExtension(
const base::ListValue* args) {
- std::string extension_id;
- CHECK(args->GetString(0, &extension_id));
+ const std::string& extension_id = args->GetList()[0].GetString();
extensions::ExtensionService* extension_service =
extensions::ExtensionSystem::Get(Profile::FromWebUI(web_ui()))
->extension_service();
diff --git a/chrome/browser/ui/webui/settings/font_handler.cc b/chrome/browser/ui/webui/settings/font_handler.cc
index d5769f25..c96e52e 100644
--- a/chrome/browser/ui/webui/settings/font_handler.cc
+++ b/chrome/browser/ui/webui/settings/font_handler.cc
@@ -49,8 +49,7 @@
void FontHandler::HandleFetchFontsData(const base::ListValue* args) {
CHECK_EQ(1U, args->GetList().size());
- std::string callback_id;
- CHECK(args->GetString(0, &callback_id));
+ const std::string& callback_id = args->GetList()[0].GetString();
AllowJavascript();
content::GetFontListAsync(base::BindOnce(&FontHandler::FontListHasLoaded,
diff --git a/chrome/browser/ui/webui/settings/import_data_handler.cc b/chrome/browser/ui/webui/settings/import_data_handler.cc
index 09f8524..21d8f98 100644
--- a/chrome/browser/ui/webui/settings/import_data_handler.cc
+++ b/chrome/browser/ui/webui/settings/import_data_handler.cc
@@ -150,8 +150,7 @@
AllowJavascript();
CHECK_EQ(1U, args->GetList().size());
- std::string callback_id;
- CHECK(args->GetString(0, &callback_id));
+ const std::string& callback_id = args->GetList()[0].GetString();
importer_list_ = std::make_unique<ImporterList>();
importer_list_->DetectSourceProfiles(
diff --git a/chrome/browser/ui/webui/settings/languages_handler.cc b/chrome/browser/ui/webui/settings/languages_handler.cc
index 609bb6c..19ae7db 100644
--- a/chrome/browser/ui/webui/settings/languages_handler.cc
+++ b/chrome/browser/ui/webui/settings/languages_handler.cc
@@ -68,17 +68,16 @@
AllowJavascript();
CHECK_EQ(1U, args->GetList().size());
- std::string language_code;
- CHECK(args->GetString(0, &language_code));
-
#if defined(OS_WIN)
PrefService* prefs = g_browser_process->local_state();
+ const std::string& language_code = args->GetList()[0].GetString();
prefs->SetString(language::prefs::kApplicationLocale, language_code);
#elif BUILDFLAG(IS_CHROMEOS_ASH)
// Secondary users and public session users cannot change the locale.
user_manager::UserManager* user_manager = user_manager::UserManager::Get();
const user_manager::User* user =
chromeos::ProfileHelper::Get()->GetUserByProfile(profile_);
+ const std::string& language_code = args->GetList()[0].GetString();
if (user &&
user->GetAccountId() == user_manager->GetPrimaryUser()->GetAccountId() &&
user->GetType() != user_manager::USER_TYPE_PUBLIC_ACCOUNT) {
diff --git a/chrome/browser/ui/webui/settings/on_startup_handler.cc b/chrome/browser/ui/webui/settings/on_startup_handler.cc
index 2a13ca9..b806f604 100644
--- a/chrome/browser/ui/webui/settings/on_startup_handler.cc
+++ b/chrome/browser/ui/webui/settings/on_startup_handler.cc
@@ -90,8 +90,7 @@
void OnStartupHandler::HandleValidateStartupPage(const base::ListValue* args) {
CHECK_EQ(args->GetList().size(), 2U);
const base::Value& callback_id = args->GetList()[0];
- std::string url_string;
- CHECK(args->GetString(1, &url_string));
+ const std::string& url_string = args->GetList()[1].GetString();
AllowJavascript();
bool valid = settings_utils::FixupAndValidateStartupPage(url_string, nullptr);
diff --git a/chrome/browser/ui/webui/settings/people_handler.cc b/chrome/browser/ui/webui/settings/people_handler.cc
index 0e28abe6..254a2af7 100644
--- a/chrome/browser/ui/webui/settings/people_handler.cc
+++ b/chrome/browser/ui/webui/settings/people_handler.cc
@@ -144,12 +144,11 @@
void ParseConfigurationArguments(const base::ListValue* args,
SyncConfigInfo* config,
const base::Value** callback_id) {
- std::string json;
- if ((*callback_id = &args->GetList()[0]) && args->GetString(1, &json) &&
- !json.empty())
- CHECK(GetConfiguration(json, config));
- else
- NOTREACHED();
+ *callback_id = &args->GetList()[0];
+ DCHECK(*callback_id);
+ const std::string& json = args->GetList()[1].GetString();
+ DCHECK(!json.empty());
+ CHECK(GetConfiguration(json, config));
}
std::string GetSyncErrorAction(SyncStatusActionType action_type) {
diff --git a/chrome/browser/ui/webui/settings/reset_settings_handler.cc b/chrome/browser/ui/webui/settings/reset_settings_handler.cc
index 72f8d4e..11a1564 100644
--- a/chrome/browser/ui/webui/settings/reset_settings_handler.cc
+++ b/chrome/browser/ui/webui/settings/reset_settings_handler.cc
@@ -135,13 +135,9 @@
AllowJavascript();
CHECK_EQ(3U, args->GetList().size());
- std::string callback_id;
- CHECK(args->GetString(0, &callback_id));
- bool send_settings = false;
- CHECK(args->GetList()[1].is_bool());
- send_settings = args->GetList()[1].GetBool();
- std::string request_origin_string;
- CHECK(args->GetString(2, &request_origin_string));
+ const std::string& callback_id = args->GetList()[0].GetString();
+ const bool& send_settings = args->GetList()[1].GetBool();
+ std::string request_origin_string = args->GetList()[2].GetString();
reset_report::ChromeResetReport::ResetRequestOrigin request_origin =
ResetRequestOriginFromString(request_origin_string);
@@ -182,8 +178,7 @@
AllowJavascript();
CHECK_EQ(1U, args->GetList().size());
- std::string callback_id;
- CHECK(args->GetString(0, &callback_id));
+ const std::string& callback_id = args->GetList()[0].GetString();
setting_snapshot_->RequestShortcuts(
base::BindOnce(&ResetSettingsHandler::OnGetReportedSettingsDone,
diff --git a/chrome/browser/ui/webui/settings/search_engines_handler.cc b/chrome/browser/ui/webui/settings/search_engines_handler.cc
index b23fb53..7de2f4b 100644
--- a/chrome/browser/ui/webui/settings/search_engines_handler.cc
+++ b/chrome/browser/ui/webui/settings/search_engines_handler.cc
@@ -339,10 +339,8 @@
CHECK_EQ(3U, args->GetList().size());
const base::Value& callback_id = args->GetList()[0];
- std::string field_name;
- std::string field_value;
- CHECK(args->GetString(1, &field_name));
- CHECK(args->GetString(2, &field_value));
+ const std::string& field_name = args->GetList()[1].GetString();
+ const std::string& field_value = args->GetList()[2].GetString();
ResolveJavascriptCallback(
callback_id, base::Value(CheckFieldValidity(field_name, field_value)));
}
@@ -377,12 +375,9 @@
const base::ListValue* args) {
if (!edit_controller_.get())
return;
- std::string search_engine;
- std::string keyword;
- std::string query_url;
- CHECK(args->GetString(0, &search_engine));
- CHECK(args->GetString(1, &keyword));
- CHECK(args->GetString(2, &query_url));
+ const std::string& search_engine = args->GetList()[0].GetString();
+ const std::string& keyword = args->GetList()[1].GetString();
+ const std::string& query_url = args->GetList()[2].GetString();
// Recheck validity. It's possible to get here with invalid input if e.g. the
// user calls the right JS functions directly from the web inspector.
diff --git a/chrome/browser/ui/webui/settings/settings_default_browser_handler.cc b/chrome/browser/ui/webui/settings/settings_default_browser_handler.cc
index c140ad4d..c3376de 100644
--- a/chrome/browser/ui/webui/settings/settings_default_browser_handler.cc
+++ b/chrome/browser/ui/webui/settings/settings_default_browser_handler.cc
@@ -64,7 +64,7 @@
AllowJavascript();
CHECK_EQ(args->GetList().size(), 1U);
- CHECK(args->GetString(0, &check_default_callback_id_));
+ check_default_callback_id_ = args->GetList()[0].GetString();
default_browser_worker_->StartCheckIsDefault(
base::BindOnce(&DefaultBrowserHandler::OnDefaultBrowserWorkerFinished,
diff --git a/chrome/browser/ui/webui/settings/settings_manage_profile_handler.cc b/chrome/browser/ui/webui/settings/settings_manage_profile_handler.cc
index e3330ba6..9d147e6d 100644
--- a/chrome/browser/ui/webui/settings/settings_manage_profile_handler.cc
+++ b/chrome/browser/ui/webui/settings/settings_manage_profile_handler.cc
@@ -226,8 +226,8 @@
CHECK(args);
CHECK_EQ(1u, args->GetList().size());
- std::u16string new_profile_name;
- CHECK(args->GetString(0, &new_profile_name));
+ std::u16string new_profile_name =
+ base::UTF8ToUTF16(args->GetList()[0].GetString());
base::TrimWhitespace(new_profile_name, base::TRIM_ALL, &new_profile_name);
CHECK(!new_profile_name.empty());
@@ -243,8 +243,7 @@
DCHECK(ProfileShortcutManager::IsFeatureEnabled());
CHECK_EQ(1U, args->GetList().size());
- std::string callback_id;
- CHECK(args->GetString(0, &callback_id));
+ const std::string& callback_id = args->GetList()[0].GetString();
// Don't show the add/remove desktop shortcut button in the single user case.
ProfileAttributesStorage& storage =
diff --git a/chrome/browser/ui/webui/settings/settings_media_devices_selection_handler.cc b/chrome/browser/ui/webui/settings/settings_media_devices_selection_handler.cc
index a32900e..1278c98 100644
--- a/chrome/browser/ui/webui/settings/settings_media_devices_selection_handler.cc
+++ b/chrome/browser/ui/webui/settings/settings_media_devices_selection_handler.cc
@@ -70,11 +70,11 @@
void MediaDevicesSelectionHandler::GetDefaultCaptureDevices(
const base::ListValue* args) {
DCHECK_EQ(1U, args->GetList().size());
- std::string type;
- if (!args->GetString(0, &type)) {
+ if (!args->GetList()[0].is_string()) {
NOTREACHED();
return;
}
+ const std::string& type = args->GetList()[0].GetString();
DCHECK(!type.empty());
if (type == kAudio)
@@ -86,11 +86,12 @@
void MediaDevicesSelectionHandler::SetDefaultCaptureDevice(
const base::ListValue* args) {
DCHECK_EQ(2U, args->GetList().size());
- std::string type, device;
- if (!(args->GetString(0, &type) && args->GetString(1, &device))) {
+ if (!args->GetList()[0].is_string() || !args->GetList()[1].is_string()) {
NOTREACHED();
return;
}
+ const std::string& type = args->GetList()[0].GetString();
+ const std::string& device = args->GetList()[1].GetString();
DCHECK(!type.empty());
DCHECK(!device.empty());
diff --git a/chrome/browser/ui/webui/settings/settings_secure_dns_handler.cc b/chrome/browser/ui/webui/settings/settings_secure_dns_handler.cc
index 6b06043d..7adb0e8 100644
--- a/chrome/browser/ui/webui/settings/settings_secure_dns_handler.cc
+++ b/chrome/browser/ui/webui/settings/settings_secure_dns_handler.cc
@@ -174,8 +174,7 @@
void SecureDnsHandler::HandleParseCustomDnsEntry(const base::ListValue* args) {
AllowJavascript();
const base::Value& callback_id = args->GetList()[0];
- std::string custom_entry;
- CHECK(args->GetString(1, &custom_entry));
+ const std::string& custom_entry = args->GetList()[1].GetString();
// Return all templates in the entry, or none if they are not all valid.
base::Value templates(base::Value::Type::LIST);
@@ -201,9 +200,8 @@
base::Value(true));
}
- std::string server_template;
- CHECK(args->GetString(0, &probe_callback_id_));
- CHECK(args->GetString(1, &server_template));
+ probe_callback_id_ = args->GetList()[0].GetString();
+ const std::string& server_template = args->GetList()[1].GetString();
net::DnsConfigOverrides overrides;
overrides.search = std::vector<std::string>();
@@ -220,10 +218,8 @@
void SecureDnsHandler::HandleRecordUserDropdownInteraction(
const base::ListValue* args) {
CHECK_EQ(2U, args->GetList().size());
- std::string old_provider;
- std::string new_provider;
- CHECK(args->GetString(0, &old_provider));
- CHECK(args->GetString(1, &new_provider));
+ const std::string& old_provider = args->GetList()[0].GetString();
+ const std::string& new_provider = args->GetList()[1].GetString();
secure_dns::UpdateDropdownHistograms(providers_, old_provider, new_provider);
}
diff --git a/chrome/browser/ui/webui/settings/site_settings_handler.cc b/chrome/browser/ui/webui/settings/site_settings_handler.cc
index 1d06d13..96cc996 100644
--- a/chrome/browser/ui/webui/settings/site_settings_handler.cc
+++ b/chrome/browser/ui/webui/settings/site_settings_handler.cc
@@ -660,9 +660,7 @@
void SiteSettingsHandler::HandleFetchUsageTotal(const base::ListValue* args) {
AllowJavascript();
CHECK_EQ(1U, args->GetList().size());
- std::string host;
- CHECK(args->GetString(0, &host));
- usage_host_ = host;
+ usage_host_ = args->GetList()[0].GetString();
update_site_details_ = true;
if (cookies_tree_model_ && !send_sites_list_) {
@@ -674,8 +672,7 @@
void SiteSettingsHandler::HandleClearUsage(const base::ListValue* args) {
CHECK_EQ(1U, args->GetList().size());
- std::string origin;
- CHECK(args->GetString(0, &origin));
+ const std::string& origin = args->GetList()[0].GetString();
GURL url(origin);
if (!url.is_valid())
return;
@@ -691,10 +688,8 @@
void SiteSettingsHandler::HandleSetDefaultValueForContentType(
const base::ListValue* args) {
CHECK_EQ(2U, args->GetList().size());
- std::string content_type;
- CHECK(args->GetString(0, &content_type));
- std::string setting;
- CHECK(args->GetString(1, &setting));
+ const std::string& content_type = args->GetList()[0].GetString();
+ const std::string& setting = args->GetList()[1].GetString();
ContentSetting default_setting;
CHECK(content_settings::ContentSettingFromString(setting, &default_setting));
ContentSettingsType type =
@@ -731,8 +726,7 @@
CHECK_EQ(2U, args->GetList().size());
const base::Value& callback_id = args->GetList()[0];
- std::string type;
- CHECK(args->GetString(1, &type));
+ const std::string& type = args->GetList()[1].GetString();
ContentSettingsType content_type =
site_settings::ContentSettingsTypeFromGroupName(type);
@@ -950,8 +944,7 @@
CHECK_EQ(2U, args->GetList().size());
const base::Value& callback_id = args->GetList()[0];
- std::string type;
- CHECK(args->GetString(1, &type));
+ const std::string& type = args->GetList()[1].GetString();
ContentSettingsType content_type =
site_settings::ContentSettingsTypeFromGroupName(type);
@@ -986,8 +979,7 @@
CHECK_EQ(2U, args->GetList().size());
const base::Value& callback_id = args->GetList()[0];
- std::string type;
- CHECK(args->GetString(1, &type));
+ const std::string& type = args->GetList()[1].GetString();
const site_settings::ChooserTypeNameEntry* chooser_type =
site_settings::ChooserTypeFromGroupName(type);
CHECK(chooser_type);
@@ -1121,14 +1113,10 @@
void SiteSettingsHandler::HandleResetCategoryPermissionForPattern(
const base::ListValue* args) {
CHECK_EQ(4U, args->GetList().size());
- std::string primary_pattern_string;
- CHECK(args->GetString(0, &primary_pattern_string));
- std::string secondary_pattern_string;
- CHECK(args->GetString(1, &secondary_pattern_string));
- std::string type;
- CHECK(args->GetString(2, &type));
- CHECK(args->GetList()[3].is_bool());
- bool incognito = args->GetList()[3].GetBool();
+ const std::string& primary_pattern_string = args->GetList()[0].GetString();
+ const std::string& secondary_pattern_string = args->GetList()[1].GetString();
+ const std::string& type = args->GetList()[2].GetString();
+ const bool& incognito = args->GetList()[3].GetBool();
ContentSettingsType content_type =
site_settings::ContentSettingsTypeFromGroupName(type);
@@ -1185,16 +1173,11 @@
void SiteSettingsHandler::HandleSetCategoryPermissionForPattern(
const base::ListValue* args) {
CHECK_EQ(5U, args->GetList().size());
- std::string primary_pattern_string;
- CHECK(args->GetString(0, &primary_pattern_string));
- std::string secondary_pattern_string;
- CHECK(args->GetString(1, &secondary_pattern_string));
- std::string type;
- CHECK(args->GetString(2, &type));
- std::string value;
- CHECK(args->GetString(3, &value));
- CHECK(args->GetList()[4].is_bool());
- bool incognito = args->GetList()[4].GetBool();
+ const std::string& primary_pattern_string = args->GetList()[0].GetString();
+ const std::string& secondary_pattern_string = args->GetList()[1].GetString();
+ const std::string& type = args->GetList()[2].GetString();
+ const std::string& value = args->GetList()[3].GetString();
+ const bool& incognito = args->GetList()[4].GetBool();
ContentSettingsType content_type =
site_settings::ContentSettingsTypeFromGroupName(type);
@@ -1258,19 +1241,16 @@
const base::ListValue* args) {
CHECK_EQ(4U, args->GetList().size());
- std::string chooser_type_str;
- CHECK(args->GetString(0, &chooser_type_str));
+ const std::string& chooser_type_str = args->GetList()[0].GetString();
const site_settings::ChooserTypeNameEntry* chooser_type =
site_settings::ChooserTypeFromGroupName(chooser_type_str);
CHECK(chooser_type);
- std::string origin_str;
- CHECK(args->GetString(1, &origin_str));
+ const std::string& origin_str = args->GetList()[1].GetString();
GURL requesting_origin(origin_str);
CHECK(requesting_origin.is_valid());
- std::string embedding_origin_str;
- CHECK(args->GetString(2, &embedding_origin_str));
+ const std::string& embedding_origin_str = args->GetList()[2].GetString();
GURL embedding_origin(embedding_origin_str);
CHECK(embedding_origin.is_valid());
@@ -1284,8 +1264,7 @@
AllowJavascript();
CHECK_EQ(2U, args->GetList().size());
const base::Value& callback_id = args->GetList()[0];
- std::string origin_string;
- CHECK(args->GetString(1, &origin_string));
+ const std::string& origin_string = args->GetList()[1].GetString();
ResolveJavascriptCallback(callback_id,
base::Value(GURL(origin_string).is_valid()));
@@ -1296,10 +1275,8 @@
AllowJavascript();
CHECK_EQ(3U, args->GetList().size());
const base::Value& callback_id = args->GetList()[0];
- std::string pattern_string;
- CHECK(args->GetString(1, &pattern_string));
- std::string type;
- CHECK(args->GetString(2, &type));
+ const std::string& pattern_string = args->GetList()[1].GetString();
+ const std::string& type = args->GetList()[2].GetString();
std::string reason;
bool is_valid =
@@ -1406,8 +1383,7 @@
void SiteSettingsHandler::HandleRemoveZoomLevel(const base::ListValue* args) {
CHECK_EQ(1U, args->GetList().size());
- std::string origin;
- CHECK(args->GetString(0, &origin));
+ std::string origin = args->GetList()[0].GetString();
if (origin ==
l10n_util::GetStringUTF8(IDS_ZOOMLEVELS_CHROME_ERROR_PAGES_LABEL)) {
@@ -1582,8 +1558,7 @@
void SiteSettingsHandler::HandleClearEtldPlus1DataAndCookies(
const base::ListValue* args) {
CHECK_EQ(1U, args->GetList().size());
- std::string etld_plus1_string;
- CHECK(args->GetString(0, &etld_plus1_string));
+ const std::string& etld_plus1_string = args->GetList()[0].GetString();
AllowJavascript();
CookieTreeNode* parent = cookies_tree_model_->GetRoot();
