Remove non-span AddLocalizedStringsBulk() variant.

Convert all callers to the span variant of AddLocalizedStringsBulk().
Fix nits and lint errors along the way.

Change-Id: I5eb83e580aa7cd3659cad33fd9d931babaa9ed56
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1928317Reviewed-by: Rebekah Potter <rbpotter@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#717765}

chrome/browser/ui/webui/certificate_manager_localized_strings_provider.cc

@@ -4,7 +4,6 @@
 
 #include "chrome/browser/ui/webui/certificate_manager_localized_strings_provider.h"
 
-#include "base/stl_util.h"
 #include "build/build_config.h"
 #include "chrome/browser/ui/webui/localized_string.h"
 #include "chrome/grit/generated_resources.h"
@@ -84,8 +83,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source) {
       // For A11y.
       {"menu", IDS_MENU},
   };
-  AddLocalizedStringsBulk(html_source, kLocalizedStrings,
-                          base::size(kLocalizedStrings));
+  AddLocalizedStringsBulk(html_source, kLocalizedStrings);
 }
 
 }  // namespace certificate_manager

chrome/browser/ui/webui/certificate_viewer_ui.cc

@@ -44,7 +44,7 @@ content::WebUIDataSource* GetWebUIDataSource(const std::string& host) {
       {"certFields", IDS_CERT_DETAILS_CERTIFICATE_FIELDS_LABEL},
       {"certFieldVal", IDS_CERT_DETAILS_CERTIFICATE_FIELD_VALUE_LABEL},
   };
-  AddLocalizedStringsBulk(html_source, kStrings, base::size(kStrings));
+  AddLocalizedStringsBulk(html_source, kStrings);
 
   html_source->UseStringsJs();
 

chrome/browser/ui/webui/chromeos/bluetooth_dialog_localized_strings_provider.cc

@@ -4,7 +4,6 @@
 
 #include "chrome/browser/ui/webui/chromeos/bluetooth_dialog_localized_strings_provider.h"
 
-#include "base/stl_util.h"
 #include "build/build_config.h"
 #include "chrome/browser/ui/webui/localized_string.h"
 #include "chrome/grit/generated_resources.h"
@@ -63,8 +62,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source) {
       {"bluetooth_connect_writeNotPermitted",
        IDS_SETTINGS_BLUETOOTH_CONNECT_WRITE_NOT_PERMITTED},
   };
-  AddLocalizedStringsBulk(html_source, kLocalizedStrings,
-                          base::size(kLocalizedStrings));
+  AddLocalizedStringsBulk(html_source, kLocalizedStrings);
 }
 
 }  // namespace bluetooth_dialog

chrome/browser/ui/webui/chromeos/cellular_setup/cellular_setup_localized_strings_provider.cc

@@ -4,7 +4,6 @@
 
 #include "chrome/browser/ui/webui/chromeos/cellular_setup/cellular_setup_localized_strings_provider.h"
 
-#include "base/stl_util.h"
 #include "chrome/browser/ui/webui/localized_string.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/login/localized_values_builder.h"
@@ -42,8 +41,7 @@ constexpr LocalizedString kLocalizedStringsWithoutPlaceholders[] = {
 }  //  namespace
 
 void AddLocalizedStrings(content::WebUIDataSource* html_source) {
-  AddLocalizedStringsBulk(html_source, kLocalizedStringsWithoutPlaceholders,
-                          base::size(kLocalizedStringsWithoutPlaceholders));
+  AddLocalizedStringsBulk(html_source, kLocalizedStringsWithoutPlaceholders);
 }
 
 void AddLocalizedValuesToBuilder(::login::LocalizedValuesBuilder* builder) {

chrome/browser/ui/webui/chromeos/crostini_installer/crostini_installer_ui.cc

@@ -63,7 +63,7 @@ void AddStringResources(content::WebUIDataSource* source) {
       {"mountContainerMessage", IDS_CROSTINI_INSTALLER_MOUNT_CONTAINER_MESSAGE},
       {"cancelingMessage", IDS_CROSTINI_INSTALLER_CANCELING},
   };
-  AddLocalizedStringsBulk(source, kStrings, base::size(kStrings));
+  AddLocalizedStringsBulk(source, kStrings);
 
   base::string16 device_name = ui::GetChromeOSDeviceName();
 

chrome/browser/ui/webui/chromeos/in_session_password_change/password_change_ui.cc

@@ -126,8 +126,7 @@ ConfirmPasswordChangeUI::ConfirmPasswordChangeUI(content::WebUI* web_ui)
       {"matchError", IDS_PASSWORD_CHANGE_PASSWORDS_DONT_MATCH},
       {"save", IDS_PASSWORD_CHANGE_CONFIRM_SAVE_BUTTON}};
 
-  AddLocalizedStringsBulk(source, kLocalizedStrings,
-                          base::size(kLocalizedStrings));
+  AddLocalizedStringsBulk(source, kLocalizedStrings);
 
   AddSize(source, "", ConfirmPasswordChangeDialog::GetSize(false, false));
   AddSize(source, "Old", ConfirmPasswordChangeDialog::GetSize(true, false));
@@ -169,8 +168,7 @@ UrgentPasswordExpiryNotificationUI::UrgentPasswordExpiryNotificationUI(
   static constexpr LocalizedString kLocalizedStrings[] = {
       {"body", IDS_PASSWORD_EXPIRY_CALL_TO_ACTION_CRITICAL},
       {"button", IDS_OK}};
-  AddLocalizedStringsBulk(source, kLocalizedStrings,
-                          base::size(kLocalizedStrings));
+  AddLocalizedStringsBulk(source, kLocalizedStrings);
 
   source->UseStringsJs();
   source->SetDefaultResource(IDR_URGENT_PASSWORD_EXPIRY_NOTIFICATION_HTML);

chrome/browser/ui/webui/chromeos/multidevice_setup/multidevice_setup_localized_strings_provider.cc

@@ -5,7 +5,6 @@
 #include "chrome/browser/ui/webui/chromeos/multidevice_setup/multidevice_setup_localized_strings_provider.h"
 
 #include "base/no_destructor.h"
-#include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/system/sys_info.h"
 #include "chrome/browser/profiles/profile.h"
@@ -122,8 +121,7 @@ GetLocalizedStringsWithPlaceholders() {
 }  //  namespace
 
 void AddLocalizedStrings(content::WebUIDataSource* html_source) {
-  AddLocalizedStringsBulk(html_source, kLocalizedStringsWithoutPlaceholders,
-                          base::size(kLocalizedStringsWithoutPlaceholders));
+  AddLocalizedStringsBulk(html_source, kLocalizedStringsWithoutPlaceholders);
 
   for (const auto& entry : GetLocalizedStringsWithPlaceholders())
     html_source->AddString(entry.name, entry.localized_string);

chrome/browser/ui/webui/chromeos/network_element_localized_strings_provider.cc

@@ -5,7 +5,6 @@
 #include "chrome/browser/ui/webui/chromeos/network_element_localized_strings_provider.h"
 
 #include "base/feature_list.h"
-#include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/chromeos/net/shill_error.h"
@@ -48,8 +47,7 @@ constexpr LocalizedString kElementLocalizedStrings[] = {
 }  //  namespace
 
 void AddLocalizedStrings(content::WebUIDataSource* html_source) {
-  AddLocalizedStringsBulk(html_source, kElementLocalizedStrings,
-                          base::size(kElementLocalizedStrings));
+  AddLocalizedStringsBulk(html_source, kElementLocalizedStrings);
 }
 
 void AddLocalizedValuesToBuilder(::login::LocalizedValuesBuilder* builder) {
@@ -167,8 +165,7 @@ void AddOncLocalizedStrings(content::WebUIDataSource* html_source) {
       {"Oncipv4-RoutingPrefix", IDS_ONC_IPV4_ROUTING_PREFIX},
       {"Oncipv6-IPAddress", IDS_ONC_IPV6_ADDRESS},
   };
-  AddLocalizedStringsBulk(html_source, kLocalizedStrings,
-                          base::size(kLocalizedStrings));
+  AddLocalizedStringsBulk(html_source, kLocalizedStrings);
 }
 
 void AddDetailsLocalizedStrings(content::WebUIDataSource* html_source) {
@@ -273,8 +270,7 @@ void AddDetailsLocalizedStrings(content::WebUIDataSource* html_source) {
       {"networkProxyWpadNone", IDS_SETTINGS_INTERNET_NETWORK_PROXY_WPAD_NONE},
       {"remove", IDS_REMOVE},
   };
-  AddLocalizedStringsBulk(html_source, kLocalizedStrings,
-                          base::size(kLocalizedStrings));
+  AddLocalizedStringsBulk(html_source, kLocalizedStrings);
 }
 
 void AddConfigLocalizedStrings(content::WebUIDataSource* html_source) {
@@ -296,8 +292,7 @@ void AddConfigLocalizedStrings(content::WebUIDataSource* html_source) {
       {"hidePassword", IDS_SETTINGS_PASSWORD_HIDE},
       {"showPassword", IDS_SETTINGS_PASSWORD_SHOW},
   };
-  AddLocalizedStringsBulk(html_source, kLocalizedStrings,
-                          base::size(kLocalizedStrings));
+  AddLocalizedStringsBulk(html_source, kLocalizedStrings);
 
   html_source->AddBoolean(
       "showHiddenNetworkWarning",
@@ -326,8 +321,7 @@ void AddErrorLocalizedStrings(content::WebUIDataSource* html_source) {
       {"networkErrorNotHardwareBacked",
        IDS_SETTINGS_INTERNET_NETWORK_REQUIRE_HARDWARE_BACKED},
   };
-  AddLocalizedStringsBulk(html_source, kLocalizedStrings,
-                          base::size(kLocalizedStrings));
+  AddLocalizedStringsBulk(html_source, kLocalizedStrings);
 
   // Include Shill errors.
   const char* const shill_errors[] = {

chrome/browser/ui/webui/chromeos/power_ui.cc

@@ -256,7 +256,7 @@ PowerUI::PowerUI(content::WebUI* web_ui) : content::WebUIController(web_ui) {
       {"frequencyStateOccupancyPercentageHeader",
        IDS_ABOUT_POWER_CPU_FREQ_STATE_OCCUPANCY_PERCENTAGE},
   };
-  AddLocalizedStringsBulk(html, kStrings, base::size(kStrings));
+  AddLocalizedStringsBulk(html, kStrings);
 
   html->UseStringsJs();
 

chrome/browser/ui/webui/chromeos/set_time_ui.cc

@@ -183,7 +183,7 @@ SetTimeUI::SetTimeUI(content::WebUI* web_ui) : WebDialogUI(web_ui) {
       {"timeLabel", IDS_SET_TIME_TIME_LABEL},
       {"doneButton", IDS_DONE},
   };
-  AddLocalizedStringsBulk(source, kStrings, base::size(kStrings));
+  AddLocalizedStringsBulk(source, kStrings);
 
   base::DictionaryValue values;
   // List of list of strings: [[ID, name], [ID, name], ...]

chrome/browser/ui/webui/chromeos/slow_ui.cc

@@ -51,7 +51,7 @@ content::WebUIDataSource* CreateSlowUIHTMLSource() {
       {"slowDescription", IDS_SLOW_DESCRIPTION},
       {"slowWarning", IDS_SLOW_WARNING},
   };
-  AddLocalizedStringsBulk(source, kStrings, base::size(kStrings));
+  AddLocalizedStringsBulk(source, kStrings);
 
   source->AddResourcePath("slow.js", IDR_SLOW_JS);
   source->AddResourcePath("slow.css", IDR_SLOW_CSS);

chrome/browser/ui/webui/chromeos/smb_shares/smb_shares_localized_strings_provider.cc

@@ -4,7 +4,6 @@
 
 #include "chrome/browser/ui/webui/chromeos/smb_shares/smb_shares_localized_strings_provider.h"
 
-#include "base/stl_util.h"
 #include "chrome/browser/ui/webui/localized_string.h"
 #include "chrome/grit/generated_resources.h"
 #include "content/public/browser/web_ui_data_source.h"
@@ -47,8 +46,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source) {
       {"smbShareDiscoveryMessage",
        IDS_SETTINGS_DOWNLOADS_ADD_SHARE_DISCOVERY_MESSAGE},
   };
-  AddLocalizedStringsBulk(html_source, kLocalizedStrings,
-                          base::size(kLocalizedStrings));
+  AddLocalizedStringsBulk(html_source, kLocalizedStrings);
 }
 
 }  // namespace smb_dialog

chrome/browser/ui/webui/components_ui.cc

@@ -56,7 +56,7 @@ content::WebUIDataSource* CreateComponentsUIHTMLSource(Profile* profile) {
       {"statusLabel", IDS_COMPONENTS_STATUS_LABEL},
       {"checkingLabel", IDS_COMPONENTS_CHECKING_LABEL},
   };
-  AddLocalizedStringsBulk(source, kStrings, base::size(kStrings));
+  AddLocalizedStringsBulk(source, kStrings);
 
   source->AddBoolean(
       "isGuest",

chrome/browser/ui/webui/device_log_ui.cc

@@ -89,7 +89,7 @@ DeviceLogUI::DeviceLogUI(content::WebUI* web_ui)
       {"logTypeFidoText", IDS_DEVICE_LOG_TYPE_FIDO},
       {"logEntryFormat", IDS_DEVICE_LOG_ENTRY},
   };
-  AddLocalizedStringsBulk(html, kStrings, base::size(kStrings));
+  AddLocalizedStringsBulk(html, kStrings);
 
   html->UseStringsJs();
   html->AddResourcePath("device_log_ui.css", IDR_DEVICE_LOG_UI_CSS);

chrome/browser/ui/webui/extensions/extensions_ui.cc

@@ -267,8 +267,7 @@ content::WebUIDataSource* CreateMdExtensionsSource(Profile* profile,
      IDS_EXTENSIONS_KIOSK_DISABLE_BAILOUT_SHORTCUT_WARNING_TITLE},
 #endif
   };
-  AddLocalizedStringsBulk(source, kLocalizedStrings,
-                          base::size(kLocalizedStrings));
+  AddLocalizedStringsBulk(source, kLocalizedStrings);
 
   source->AddString("errorLinesNotShownSingular",
                     l10n_util::GetPluralStringFUTF16(

chrome/browser/ui/webui/history_ui.cc

@@ -12,7 +12,6 @@
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
-#include "base/stl_util.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #include "chrome/browser/profiles/profile.h"

chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc

@@ -79,7 +79,7 @@ content::WebUIDataSource* CreateLocalDiscoveryHTMLSource() {
     {"titleConnector", IDS_LOCAL_DISCOVERY_CONNECTOR_SECTION},
 #endif
   };
-  AddLocalizedStringsBulk(source, kStrings, base::size(kStrings));
+  AddLocalizedStringsBulk(source, kStrings);
 
   source->UseStringsJs();
 

chrome/browser/ui/webui/localized_string.cc

@@ -11,9 +11,3 @@ void AddLocalizedStringsBulk(content::WebUIDataSource* html_source,
   for (const auto& str : strings)
     html_source->AddLocalizedString(str.name, str.id);
 }
-
-void AddLocalizedStringsBulk(content::WebUIDataSource* html_source,
-                             const LocalizedString* strings,
-                             size_t num_strings) {
-  AddLocalizedStringsBulk(html_source, base::make_span(strings, num_strings));
-}

chrome/browser/ui/webui/localized_string.h

@@ -20,14 +20,7 @@ struct LocalizedString {
 
 // Calls content::WebUIDataSource::AddLocalizedString() in a for-loop for
 // |strings|. Reduces code size vs. reimplementing the same for-loop.
-// Prefer this base::span version when possible. The 3 parameter version below
-// will likely be deprecated in the future if all the callers can be easily
-// converted to this version.
 void AddLocalizedStringsBulk(content::WebUIDataSource* html_source,
                              base::span<const LocalizedString> strings);
 
-void AddLocalizedStringsBulk(content::WebUIDataSource* html_source,
-                             const LocalizedString* strings,
-                             size_t num_strings);
-
 #endif  // CHROME_BROWSER_UI_WEBUI_LOCALIZED_STRING_H_

chrome/browser/ui/webui/management_ui.cc

@@ -6,7 +6,6 @@
 
 #include <memory>
 
-#include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/policy/profile_policy_connector.h"
 #include "chrome/browser/profiles/profile.h"

chrome/browser/ui/webui/media/webrtc_logs_ui.cc

@@ -73,7 +73,7 @@ content::WebUIDataSource* CreateWebRtcLogsUIHTMLSource() {
       {"noTextLogsMessage", IDS_WEBRTC_LOGS_NO_TEXT_LOGS_MESSAGE},
       {"noEventLogsMessage", IDS_WEBRTC_LOGS_NO_EVENT_LOGS_MESSAGE},
   };
-  AddLocalizedStringsBulk(source, kStrings, base::size(kStrings));
+  AddLocalizedStringsBulk(source, kStrings);
 
   source->UseStringsJs();
   source->AddResourcePath("webrtc_logs.js", IDR_WEBRTC_LOGS_JS);

chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc

@@ -27,7 +27,7 @@ content::WebUIDataSource* CreateNewTabPageUiHtmlSource() {
   static constexpr LocalizedString kStrings[] = {
       {"title", IDS_NEW_TAB_TITLE},
   };
-  AddLocalizedStringsBulk(source, kStrings, base::size(kStrings));
+  AddLocalizedStringsBulk(source, kStrings);
 
   source->AddResourcePath("new_tab_page.mojom-lite.js",
                           IDR_NEW_TAB_PAGE_MOJO_LITE_JS);

chrome/browser/ui/webui/policy_indicator_localized_strings_provider.cc

@@ -4,7 +4,6 @@
 
 #include "chrome/browser/ui/webui/policy_indicator_localized_strings_provider.h"
 
-#include "base/stl_util.h"
 #include "build/build_config.h"
 #include "chrome/browser/ui/webui/localized_string.h"
 #include "chrome/grit/generated_resources.h"
@@ -39,8 +38,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source) {
      IDS_CONTROLLED_SETTING_CHILD_RESTRICTION},
 #endif
   };
-  AddLocalizedStringsBulk(html_source, localized_strings,
-                          base::size(localized_strings));
+  AddLocalizedStringsBulk(html_source, localized_strings);
 }
 
 }  // namespace policy_indicator

chrome/browser/ui/webui/policy_ui_handler.cc

@@ -211,8 +211,10 @@ void GetUserAffiliationStatus(base::DictionaryValue* dict, Profile* profile) {
 void GetOffHoursStatus(base::DictionaryValue* dict) {
   policy::off_hours::DeviceOffHoursController* off_hours_controller =
       chromeos::DeviceSettingsService::Get()->device_off_hours_controller();
-  if (off_hours_controller)
-    dict->SetBoolean("isOffHoursActive", off_hours_controller->is_off_hours_mode());
+  if (off_hours_controller) {
+    dict->SetBoolean("isOffHoursActive",
+                     off_hours_controller->is_off_hours_mode());
+  }
 }
 #endif  // defined(OS_CHROMEOS)
 
@@ -712,8 +714,7 @@ PolicyUIHandler::~PolicyUIHandler() {
 
 void PolicyUIHandler::AddCommonLocalizedStringsToSource(
     content::WebUIDataSource* source) {
-  AddLocalizedStringsBulk(source, policy::kPolicySources,
-                          policy::POLICY_SOURCE_COUNT);
+  AddLocalizedStringsBulk(source, policy::kPolicySources);
 
   static constexpr LocalizedString kStrings[] = {
       {"conflict", IDS_POLICY_LABEL_CONFLICT},
@@ -737,7 +738,7 @@ void PolicyUIHandler::AddCommonLocalizedStringsToSource(
       {"unset", IDS_POLICY_UNSET},
       {"value", IDS_POLICY_LABEL_VALUE},
   };
-  AddLocalizedStringsBulk(source, kStrings, base::size(kStrings));
+  AddLocalizedStringsBulk(source, kStrings);
 
   source->UseStringsJs();
 }

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

@@ -16,7 +16,6 @@
 #include "base/macros.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/metrics/histogram_macros.h"
-#include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
@@ -301,8 +300,7 @@ void AddPrintPreviewStrings(content::WebUIDataSource* source) {
     {"openingPDFInPreview", IDS_PRINT_PREVIEW_OPENING_PDF_IN_PREVIEW_APP},
 #endif
   };
-  AddLocalizedStringsBulk(source, kLocalizedStrings,
-                          base::size(kLocalizedStrings));
+  AddLocalizedStringsBulk(source, kLocalizedStrings);
 
   source->AddString("gcpCertificateErrorLearnMoreURL",
                     chrome::kCloudPrintCertificateErrorLearnMoreURL);

chrome/browser/ui/webui/signin/signin_email_confirmation_ui.cc

@@ -45,7 +45,7 @@ SigninEmailConfirmationUI::SigninEmailConfirmationUI(content::WebUI* web_ui)
       {"signinEmailConfirmationCloseLabel",
        IDS_SIGNIN_EMAIL_CONFIRMATION_CLOSE_BUTTON_LABEL},
   };
-  AddLocalizedStringsBulk(source, kStrings, base::size(kStrings));
+  AddLocalizedStringsBulk(source, kStrings);
 
   base::DictionaryValue strings;
   webui::SetLoadTimeDataDefaults(g_browser_process->GetApplicationLocale(),

chrome/browser/ui/webui/system_info_ui.cc

@@ -61,7 +61,7 @@ content::WebUIDataSource* CreateSystemInfoUIDataSource() {
       {"collapseBtn", IDS_ABOUT_SYS_COLLAPSE},
       {"parseError", IDS_ABOUT_SYS_PARSE_ERROR},
   };
-  AddLocalizedStringsBulk(html_source, kStrings, base::size(kStrings));
+  AddLocalizedStringsBulk(html_source, kStrings);
 
   html_source->AddResourcePath("about_sys.js", IDR_ABOUT_SYS_JS);
   html_source->AddResourcePath("about_sys.css", IDR_ABOUT_SYS_CSS);

chrome/browser/ui/webui/tab_strip/tab_strip_ui.cc

@@ -491,7 +491,7 @@ TabStripUI::TabStripUI(content::WebUI* web_ui)
       {"desktopCapturing", IDS_TAB_AX_LABEL_DESKTOP_CAPTURING_FORMAT},
       {"vrPresenting", IDS_TAB_AX_LABEL_VR_PRESENTING},
   };
-  AddLocalizedStringsBulk(html_source, kStrings, base::size(kStrings));
+  AddLocalizedStringsBulk(html_source, kStrings);
   html_source->UseStringsJs();
 
   content::WebUIDataSource::Add(profile, html_source);

chrome/browser/ui/webui/version_ui.cc

@@ -79,7 +79,7 @@ WebUIDataSource* CreateVersionUIDataSource() {
     {version_ui::kGmsName, IDS_VERSION_UI_GMS},
 #endif  // OS_ANDROID
   };
-  AddLocalizedStringsBulk(html_source, kStrings, base::size(kStrings));
+  AddLocalizedStringsBulk(html_source, kStrings);
 
   VersionUI::AddVersionDetailStrings(html_source);
 
@@ -184,5 +184,6 @@ void VersionUI::AddVersionDetailStrings(content::WebUIDataSource* html_source) {
                          version_utils::win::GetCohortVersionInfo());
 #endif  // defined(OS_WIN)
 
-  html_source->AddString(version_ui::kSanitizer, version_info::GetSanitizerList());
+  html_source->AddString(version_ui::kSanitizer,
+                         version_info::GetSanitizerList());
 }

chrome/browser/ui/webui/welcome/welcome_ui.cc

@@ -52,7 +52,7 @@ bool ShouldHandleRequestCallback(base::WeakPtr<WelcomeUI> weak_ptr,
     return false;
   }
 
-  return !weak_ptr ? false : true;
+  return !!weak_ptr;
 }
 
 void HandleRequestCallback(
@@ -109,8 +109,7 @@ void AddStrings(content::WebUIDataSource* html_source) {
       {"landingNewUser", IDS_WELCOME_LANDING_NEW_USER},
       {"landingExistingUser", IDS_WELCOME_LANDING_EXISTING_USER},
   };
-  AddLocalizedStringsBulk(html_source, kLocalizedStrings,
-                          base::size(kLocalizedStrings));
+  AddLocalizedStringsBulk(html_source, kLocalizedStrings);
 }
 
 }  // namespace