chromium/src
0
Fork 0
Code Activity

Convert some "unsafe" make_span() calls to span_from_ref()

Browse Source 
This will facilitate removing unsafe_buffer usage in the future.

Fully automated change.

Change-Id: I0d5f0369fe002a61d6da83db807612cf6a51c064
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5758178
Owners-Override: Daniel Cheng <dcheng@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1336912}
This commit is contained in:
Tom Sepez
2024-08-03 01:54:40 +00:00
committed by Chromium LUCI CQ
parent 426e4b547f
commit b075e1978c
38 changed files with 131 additions and 131 deletions
base
files
file_descriptor_watcher_posix_unittest.cc
i18n
streaming_utf8_validator_unittest.cc
sync_socket_unittest.cc
task
thread_pool
thread_pool_impl_unittest.cc
trace_event
traced_value.cc
win
scoped_handle_verifier.h
chrome
browser
ash
policy
reporting
install_event_log.h
web_applications
os_integration
mac
web_app_shortcut_creator.mm
web_app_shortcut_win.cc
renderer
cart
commerce_hint_agent.cc
wallet
boarding_pass_extractor.cc
chromecast/media/cma/backend/alsa
scoped_alsa_mixer_unittest.cc
chromeos
ash
components
dbus
kerberos
fake_kerberos_client.cc
session_manager
session_manager_client.cc
printing
uri_impl.cc
components
metrics
serialization
serialization_utils.cc
power_metrics
energy_metrics_provider_linux.cc
ukm
ukm_recorder_impl.cc
variations
field_trial_config
field_trial_util_unittest.cc
content
browser
child_process_host_impl.cc
zygote
zygote_linux.cc
crypto
signature_verifier_unittest.cc
device/gamepad
dualshock4_controller.cc
media/filters
chunk_demuxer_unittest.cc
net
disk_cache
backend_unittest.cc
blockfile
sparse_control.cc
simple
simple_version_upgrade_unittest.cc
http
http_stream_factory_unittest.cc
quic
crypto
proof_verifier_chromium.cc
quic_session_pool_test.cc
socket
transport_connect_job_unittest.ccwebsocket_transport_client_socket_pool_unittest.cc
services/device/hid
hid_service_linux_unittest.cc
testing/libfuzzer/fuzzilli
fuzzilli_driver.cc
third_party/blink/renderer
core
frame
web_frame_test.cc
scheduler_integration_tests
virtual_time_test.cc
modules
media_capabilities
media_capabilities.cc
platform
image-decoders
image_decoder_base_test.cc

8
base/files/file_descriptor_watcher_posix_unittest.cc

@ -175,7 +175,7 @@ class FileDescriptorWatcherTest
void WriteByte() {
constexpr char kByte = '!';
ASSERT_TRUE(WriteFileDescriptor(write_file_descriptor(),
as_bytes(make_span(&kByte, 1u))));
as_bytes(span_from_ref(kByte))));
}
void ReadByte() {
@ -184,13 +184,13 @@ class FileDescriptorWatcherTest
EXPECT_TRUE(thread_checker_.CalledOnValidThread());
char buffer;
ASSERT_TRUE(ReadFromFD(read_file_descriptor(), make_span(&buffer, 1u)));
ASSERT_TRUE(ReadFromFD(read_file_descriptor(), span_from_ref(buffer)));
}
void WriteByte2() {
constexpr char kByte = '!';
ASSERT_TRUE(WriteFileDescriptor(write_file_descriptor2(),
as_bytes(make_span(&kByte, 1u))));
as_bytes(span_from_ref(kByte))));
}
void ReadByte2() {
@ -199,7 +199,7 @@ class FileDescriptorWatcherTest
EXPECT_TRUE(thread_checker_.CalledOnValidThread());
char buffer;
ASSERT_TRUE(ReadFromFD(read_file_descriptor2(), make_span(&buffer, 1u)));
ASSERT_TRUE(ReadFromFD(read_file_descriptor2(), span_from_ref(buffer)));
}
void CloseWriteFd2() {

2
base/i18n/streaming_utf8_validator_unittest.cc

@ -239,7 +239,7 @@ class StreamingUtf8ValidatorSingleSequenceTest : public ::testing::Test {
std::string_view sequence = *it;
StreamingUtf8Validator::State state = VALID_ENDPOINT;
for (const auto& cit : sequence) {
state = validator.AddBytes(base::as_bytes(base::make_span(&cit, 1u)));
state = validator.AddBytes(base::as_bytes(base::span_from_ref(cit)));
}
EXPECT_EQ(expected, state) << "Failed for \"" << sequence << "\"";
}

10
base/sync_socket_unittest.cc

@ -84,10 +84,10 @@ void SendReceivePeek(SyncSocket* socket_a, SyncSocket* socket_b) {
// Verify |socket_a| can send to |socket_a| and |socket_a| can Receive from
// |socket_a|.
ASSERT_EQ(sizeof(kSending),
socket_a->Send(as_bytes(make_span(&kSending, 1u))));
socket_a->Send(as_bytes(span_from_ref(kSending))));
ASSERT_EQ(sizeof(kSending), socket_b->Peek());
ASSERT_EQ(sizeof(kSending),
socket_b->Receive(as_writable_bytes(make_span(&received, 1u))));
socket_b->Receive(as_writable_bytes(span_from_ref(received))));
ASSERT_EQ(kSending, received);
ASSERT_EQ(0u, socket_a->Peek());
@ -96,10 +96,10 @@ void SendReceivePeek(SyncSocket* socket_a, SyncSocket* socket_b) {
// Now verify the reverse.
received = 0;
ASSERT_EQ(sizeof(kSending),
socket_b->Send(as_bytes(make_span(&kSending, 1u))));
socket_b->Send(as_bytes(span_from_ref(kSending))));
ASSERT_EQ(sizeof(kSending), socket_a->Peek());
ASSERT_EQ(sizeof(kSending),
socket_a->Receive(as_writable_bytes(make_span(&received, 1u))));
socket_a->Receive(as_writable_bytes(span_from_ref(received))));
ASSERT_EQ(kSending, received);
ASSERT_EQ(0u, socket_a->Peek());
@ -182,7 +182,7 @@ TEST_F(CancelableSyncSocketTest, ShutdownCancelsReceiveWithTimeout) {
TEST_F(CancelableSyncSocketTest, ReceiveAfterShutdown) {
socket_a_.Shutdown();
int data = 0;
EXPECT_EQ(0u, socket_a_.Receive(as_writable_bytes(make_span(&data, 1u))));
EXPECT_EQ(0u, socket_a_.Receive(as_writable_bytes(span_from_ref(data))));
}
TEST_F(CancelableSyncSocketTest, ReceiveWithTimeoutAfterShutdown) {

2
base/task/thread_pool/thread_pool_impl_unittest.cc

@ -970,7 +970,7 @@ TEST_P(ThreadPoolImplTest, FileDescriptorWatcherNoOpsAfterShutdown) {
thread_pool_->Shutdown();
constexpr char kByte = '!';
ASSERT_TRUE(WriteFileDescriptor(pipes[1], as_bytes(make_span(&kByte, 1u))));
ASSERT_TRUE(WriteFileDescriptor(pipes[1], as_bytes(span_from_ref(kByte))));
// Give a chance for the file watcher to fire before closing the handles.
PlatformThread::Sleep(TestTimeouts::tiny_timeout());

44
base/trace_event/traced_value.cc

@ -70,12 +70,12 @@ const bool kStackTypeArray = true;
#endif
inline void WriteKeyNameAsRawPtr(Pickle& pickle, const char* ptr) {
pickle.WriteBytes(as_bytes(make_span(&kTypeCStr, 1u)));
pickle.WriteBytes(as_bytes(span_from_ref(kTypeCStr)));
pickle.WriteUInt64(static_cast<uint64_t>(reinterpret_cast<uintptr_t>(ptr)));
}
inline void WriteKeyNameWithCopy(Pickle& pickle, std::string_view str) {
pickle.WriteBytes(as_bytes(make_span(&kTypeString, 1u)));
pickle.WriteBytes(as_bytes(span_from_ref(kTypeString)));
pickle.WriteString(str);
}
@ -106,50 +106,50 @@ class PickleWriter final : public TracedValue::Writer {
bool IsProtoWriter() const override { return false; }
void SetInteger(const char* name, int value) override {
pickle_.WriteBytes(as_bytes(make_span(&kTypeInt, 1u)));
pickle_.WriteBytes(as_bytes(span_from_ref(kTypeInt)));
pickle_.WriteInt(value);
WriteKeyNameAsRawPtr(pickle_, name);
}
void SetIntegerWithCopiedName(std::string_view name, int value) override {
pickle_.WriteBytes(as_bytes(make_span(&kTypeInt, 1u)));
pickle_.WriteBytes(as_bytes(span_from_ref(kTypeInt)));
pickle_.WriteInt(value);
WriteKeyNameWithCopy(pickle_, name);
}
void SetDouble(const char* name, double value) override {
pickle_.WriteBytes(as_bytes(make_span(&kTypeDouble, 1u)));
pickle_.WriteBytes(as_bytes(span_from_ref(kTypeDouble)));
pickle_.WriteDouble(value);
WriteKeyNameAsRawPtr(pickle_, name);
}
void SetDoubleWithCopiedName(std::string_view name, double value) override {
pickle_.WriteBytes(as_bytes(make_span(&kTypeDouble, 1u)));
pickle_.WriteBytes(as_bytes(span_from_ref(kTypeDouble)));
pickle_.WriteDouble(value);
WriteKeyNameWithCopy(pickle_, name);
}
void SetBoolean(const char* name, bool value) override {
pickle_.WriteBytes(as_bytes(make_span(&kTypeBool, 1u)));
pickle_.WriteBytes(as_bytes(span_from_ref(kTypeBool)));
pickle_.WriteBool(value);
WriteKeyNameAsRawPtr(pickle_, name);
}
void SetBooleanWithCopiedName(std::string_view name, bool value) override {
pickle_.WriteBytes(as_bytes(make_span(&kTypeBool, 1u)));
pickle_.WriteBytes(as_bytes(span_from_ref(kTypeBool)));
pickle_.WriteBool(value);
WriteKeyNameWithCopy(pickle_, name);
}
void SetString(const char* name, std::string_view value) override {
pickle_.WriteBytes(as_bytes(make_span(&kTypeString, 1u)));
pickle_.WriteBytes(as_bytes(span_from_ref(kTypeString)));
pickle_.WriteString(value);
WriteKeyNameAsRawPtr(pickle_, name);
}
void SetStringWithCopiedName(std::string_view name,
std::string_view value) override {
pickle_.WriteBytes(as_bytes(make_span(&kTypeString, 1u)));
pickle_.WriteBytes(as_bytes(span_from_ref(kTypeString)));
pickle_.WriteString(value);
WriteKeyNameWithCopy(pickle_, name);
}
@ -173,57 +173,57 @@ class PickleWriter final : public TracedValue::Writer {
}
void BeginArray() override {
pickle_.WriteBytes(as_bytes(make_span(&kTypeStartArray, 1u)));
pickle_.WriteBytes(as_bytes(span_from_ref(kTypeStartArray)));
}
void BeginDictionary() override {
pickle_.WriteBytes(as_bytes(make_span(&kTypeStartDict, 1u)));
pickle_.WriteBytes(as_bytes(span_from_ref(kTypeStartDict)));
}
void BeginDictionary(const char* name) override {
pickle_.WriteBytes(as_bytes(make_span(&kTypeStartDict, 1u)));
pickle_.WriteBytes(as_bytes(span_from_ref(kTypeStartDict)));
WriteKeyNameAsRawPtr(pickle_, name);
}
void BeginDictionaryWithCopiedName(std::string_view name) override {
pickle_.WriteBytes(as_bytes(make_span(&kTypeStartDict, 1u)));
pickle_.WriteBytes(as_bytes(span_from_ref(kTypeStartDict)));
WriteKeyNameWithCopy(pickle_, name);
}
void BeginArray(const char* name) override {
pickle_.WriteBytes(as_bytes(make_span(&kTypeStartArray, 1u)));
pickle_.WriteBytes(as_bytes(span_from_ref(kTypeStartArray)));
WriteKeyNameAsRawPtr(pickle_, name);
}
void BeginArrayWithCopiedName(std::string_view name) override {
pickle_.WriteBytes(as_bytes(make_span(&kTypeStartArray, 1u)));
pickle_.WriteBytes(as_bytes(span_from_ref(kTypeStartArray)));
WriteKeyNameWithCopy(pickle_, name);
}
void EndDictionary() override {
pickle_.WriteBytes(as_bytes(make_span(&kTypeEndDict, 1u)));
pickle_.WriteBytes(as_bytes(span_from_ref(kTypeEndDict)));
}
void EndArray() override {
pickle_.WriteBytes(as_bytes(make_span(&kTypeEndArray, 1u)));
pickle_.WriteBytes(as_bytes(span_from_ref(kTypeEndArray)));
}
void AppendInteger(int value) override {
pickle_.WriteBytes(as_bytes(make_span(&kTypeInt, 1u)));
pickle_.WriteBytes(as_bytes(span_from_ref(kTypeInt)));
pickle_.WriteInt(value);
}
void AppendDouble(double value) override {
pickle_.WriteBytes(as_bytes(make_span(&kTypeDouble, 1u)));
pickle_.WriteBytes(as_bytes(span_from_ref(kTypeDouble)));
pickle_.WriteDouble(value);
}
void AppendBoolean(bool value) override {
pickle_.WriteBytes(as_bytes(make_span(&kTypeBool, 1u)));
pickle_.WriteBytes(as_bytes(span_from_ref(kTypeBool)));
pickle_.WriteBool(value);
}
void AppendString(std::string_view value) override {
pickle_.WriteBytes(as_bytes(make_span(&kTypeString, 1u)));
pickle_.WriteBytes(as_bytes(span_from_ref(kTypeString)));
pickle_.WriteString(value);
}

2
base/win/scoped_handle_verifier.h

@ -27,7 +27,7 @@ namespace internal {
struct HandleHash {
size_t operator()(const HANDLE& handle) const {
return base::FastHash(as_bytes(make_span(&handle, 1u)));
return base::FastHash(as_bytes(span_from_ref(handle)));
}
};

8
chrome/browser/ash/policy/reporting/install_event_log.h

@ -94,7 +94,7 @@ InstallEventLog<T, C>::InstallEventLog(const base::FilePath& file_name)
int64_t version;
if (!file.ReadAtCurrentPosAndCheck(
base::as_writable_bytes(base::make_span(&version, 1u)))) {
base::as_writable_bytes(base::span_from_ref(version)))) {
LOG(WARNING) << "Corrupted install log.";
return;
}
@ -106,7 +106,7 @@ InstallEventLog<T, C>::InstallEventLog(const base::FilePath& file_name)
ssize_t entries;
if (!file.ReadAtCurrentPosAndCheck(
base::as_writable_bytes(base::make_span(&entries, 1u)))) {
base::as_writable_bytes(base::span_from_ref(entries)))) {
LOG(WARNING) << "Corrupted install log.";
return;
}
@ -169,14 +169,14 @@ void InstallEventLog<T, C>::Store() {
}
if (!file.WriteAtCurrentPosAndCheck(
base::as_bytes(base::make_span(&kLogFileVersion, 1u)))) {
base::as_bytes(base::span_from_ref(kLogFileVersion)))) {
LOG(WARNING) << "Unable to store install log.";
return;
}
ssize_t entries = logs_.size();
if (!file.WriteAtCurrentPosAndCheck(
base::as_bytes(base::make_span(&entries, 1u)))) {
base::as_bytes(base::span_from_ref(entries)))) {
LOG(WARNING) << "Unable to store install log.";
return;
}

4
chrome/browser/web_applications/os_integration/mac/web_app_shortcut_creator.mm

@ -142,7 +142,7 @@ bool AddPathToRPath(const base::FilePath& executable_path,
mach_header_64 header;
if (!executable_file.ReadAtCurrentPosAndCheck(
base::as_writable_bytes(base::make_span(&header, 1u))) ||
base::as_writable_bytes(base::span_from_ref(header))) ||
header.magic != MH_MAGIC_64 || header.filetype != MH_EXECUTE) {
LOG(ERROR) << "File at " << executable_path
<< " is not a valid Mach-O executable";
@ -184,7 +184,7 @@ bool AddPathToRPath(const base::FilePath& executable_path,
// Write the updated header and commands back to the file.
if (!executable_file.WriteAndCheck(
0, base::as_bytes(base::make_span(&header, 1u))) ||
0, base::as_bytes(base::span_from_ref(header))) ||
!executable_file.WriteAndCheck(sizeof header,
base::make_span(commands))) {
LOG(ERROR) << "Failed to write updated load commands to "

2
chrome/browser/web_applications/os_integration/web_app_shortcut_win.cc

@ -94,7 +94,7 @@ bool SaveIconWithCheckSum(const base::FilePath& icon_file,
// Passing digest as one element in a span of digest fields, therefore the 1u,
// and then having as_bytes converting it to a new span of uint8_t's.
return base::WriteFile(cheksum_file,
base::as_bytes(base::make_span(&digest, 1u)));
base::as_bytes(base::span_from_ref(digest)));
}
// Returns true if |icon_file| is missing or different from |image|.

2
chrome/renderer/cart/commerce_hint_agent.cc

@ -876,7 +876,7 @@ void CommerceHintAgent::ExtractCartWithUpdatedScript(
GetProductExtractionScript(product_id_json, cart_extraction_script));
main_frame->RequestExecuteScript(
ISOLATED_WORLD_ID_CHROME_INTERNAL, base::make_span(&source, 1u),
ISOLATED_WORLD_ID_CHROME_INTERNAL, base::span_from_ref(source),
blink::mojom::UserActivationOption::kDoNotActivate,
blink::mojom::EvaluationTiming::kAsynchronous,
blink::mojom::LoadEventBlockingOption::kDoNotBlock,

2
chrome/renderer/wallet/boarding_pass_extractor.cc

@ -151,7 +151,7 @@ void BoardingPassExtractor::ExtractBoardingPassWithScript(
blink::WebScriptSource(blink::WebString::FromUTF8(script));
main_frame->RequestExecuteScript(
ISOLATED_WORLD_ID_CHROME_INTERNAL, base::make_span(&source, 1u),
ISOLATED_WORLD_ID_CHROME_INTERNAL, base::span_from_ref(source),
blink::mojom::UserActivationOption::kDoNotActivate,
blink::mojom::EvaluationTiming::kAsynchronous,
blink::mojom::LoadEventBlockingOption::kDoNotBlock,

4
chromecast/media/cma/backend/alsa/scoped_alsa_mixer_unittest.cc

@ -72,13 +72,13 @@ class ScopedAlsaMixerEventTest : public ::testing::Test {
void ReadByte() {
char buffer;
ASSERT_TRUE(base::ReadFromFD(pipe_fds_[0], base::make_span(&buffer, 1u)));
ASSERT_TRUE(base::ReadFromFD(pipe_fds_[0], base::span_from_ref(buffer)));
}
void WriteByte() {
constexpr char kByte = '!';
ASSERT_TRUE(base::WriteFileDescriptor(
pipe_fds_[1], as_bytes(base::make_span(&kByte, 1u))));
pipe_fds_[1], as_bytes(base::span_from_ref(kByte))));
}
base::test::TaskEnvironment task_environment_;

2
chromeos/ash/components/dbus/kerberos/fake_kerberos_client.cc

@ -111,7 +111,7 @@ void PostResponse(base::OnceCallback<void(const TProto&)> callback,
std::string ReadPassword(int password_fd) {
std::string password;
char c;
while (base::ReadFromFD(password_fd, base::make_span(&c, 1u))) {
while (base::ReadFromFD(password_fd, base::span_from_ref(c))) {
password.push_back(c);
}
return password;

2
chromeos/ash/components/dbus/session_manager/session_manager_client.cc

@ -125,7 +125,7 @@ base::ScopedFD CreatePasswordPipe(const std::string& data) {
const size_t data_size = data.size();
base::WriteFileDescriptor(pipe_write_end.get(),
base::as_bytes(base::make_span(&data_size, 1u)));
base::as_bytes(base::span_from_ref(data_size)));
base::WriteFileDescriptor(pipe_write_end.get(), data);
return pipe_read_end;

4
chromeos/printing/uri_impl.cc

@ -111,7 +111,7 @@ bool Uri::Pim::ParseString(const Iter& begin,
// Try to parse UTF-8 character.
base::StreamingUtf8Validator utf_parser;
base::StreamingUtf8Validator::State state =
utf_parser.AddBytes(base::as_bytes(base::make_span(&c, 1u)));
utf_parser.AddBytes(base::as_bytes(base::span_from_ref(c)));
if (state != base::StreamingUtf8Validator::State::VALID_MIDPOINT) {
parser_error_.status = ParserStatus::kDisallowedASCIICharacter;
return false;
@ -127,7 +127,7 @@ bool Uri::Pim::ParseString(const Iter& begin,
parser_error_.status = ParserStatus::kInvalidPercentEncoding;
return false;
}
state = utf_parser.AddBytes(base::as_bytes(base::make_span(&c, 1u)));
state = utf_parser.AddBytes(base::as_bytes(base::span_from_ref(c)));
if (state == base::StreamingUtf8Validator::State::INVALID) {
parser_error_.status = ParserStatus::kInvalidUTF8Character;
return false;

2
components/metrics/serialization/serialization_utils.cc

@ -275,7 +275,7 @@ bool SerializationUtils::WriteMetricToFile(const MetricSample& sample,
uint32_t encoded_size = base::checked_cast<uint32_t>(size);
if (!base::WriteFileDescriptor(
file_descriptor.get(),
base::as_bytes(base::make_span(&encoded_size, 1u)))) {
base::as_bytes(base::span_from_ref(encoded_size)))) {
DPLOG(ERROR) << "error writing message length: " << filename;
std::ignore = flock(file_descriptor.get(), LOCK_UN);
return false;

2
components/power_metrics/energy_metrics_provider_linux.cc

@ -123,7 +123,7 @@ EnergyMetricsProviderLinux::CaptureMetrics() {
uint64_t absolute_energy;
if (!base::ReadFromFD(
event.fd.get(),
base::as_writable_chars(base::make_span(&absolute_energy, 1u)))) {
base::as_writable_chars(base::span_from_ref(absolute_energy)))) {
LOG(ERROR) << "Failed to read absolute energy of " << event.metric_type;
continue;
}

4
components/ukm/ukm_recorder_impl.cc

@ -1231,9 +1231,9 @@ bool UkmRecorderImpl::IsSampledIn(int64_t source_id,
// purposes.
uint32_t sampled_num = sampling_seed_;
sampled_num =
base::Crc32(sampled_num, base::as_bytes(base::make_span(&source_id, 1u)));
base::Crc32(sampled_num, base::as_bytes(base::span_from_ref(source_id)));
sampled_num =
base::Crc32(sampled_num, base::as_bytes(base::make_span(&event_id, 1u)));
base::Crc32(sampled_num, base::as_bytes(base::span_from_ref(event_id)));
return sampled_num % sampling_rate == 0;
}

62
components/variations/field_trial_config/field_trial_util_unittest.cc

@ -188,7 +188,7 @@ TEST_F(FieldTrialUtilTest, AssociateParamsFromFieldTrialConfig) {
{{"x", "1"}, {"y", "2"}};
ExperimentBuilder study_0_experiment_0_builder;
study_0_experiment_0_builder.name = "TestGroup1";
study_0_experiment_0_builder.platforms = base::make_span(&platform, 1u);
study_0_experiment_0_builder.platforms = base::span_from_ref(platform);
study_0_experiment_0_builder.params = array_kFieldTrialConfig_params_0;
const FieldTrialTestingExperiment array_kFieldTrialConfig_experiments_0[] = {
study_0_experiment_0_builder.Build(),
@ -197,11 +197,11 @@ TEST_F(FieldTrialUtilTest, AssociateParamsFromFieldTrialConfig) {
{{"x", "3"}, {"y", "4"}};
ExperimentBuilder study_1_experiment_0_builder;
study_1_experiment_0_builder.name = "TestGroup2";
study_1_experiment_0_builder.platforms = base::make_span(&platform, 1u);
study_1_experiment_0_builder.platforms = base::span_from_ref(platform);
study_1_experiment_0_builder.params = array_kFieldTrialConfig_params_0;
ExperimentBuilder study_1_experiment_1_builder;
study_1_experiment_1_builder.name = "TestGroup2-2";
study_1_experiment_1_builder.platforms = base::make_span(&platform, 1u);
study_1_experiment_1_builder.platforms = base::span_from_ref(platform);
study_1_experiment_1_builder.params = array_kFieldTrialConfig_params_1;
const FieldTrialTestingExperiment array_kFieldTrialConfig_experiments_1[] = {
study_1_experiment_0_builder.Build(),
@ -278,7 +278,7 @@ TEST_F(FieldTrialUtilTest, FieldTrialConfigSkipOverridden) {
const char* enable_features_0[] = {"A"};
ExperimentBuilder experiment_0_builder;
experiment_0_builder.name = "TestGroup0";
experiment_0_builder.platforms = base::make_span(&platform, 1u);
experiment_0_builder.platforms = base::span_from_ref(platform);
experiment_0_builder.enable_features = enable_features_0;
const FieldTrialTestingExperiment array_kFieldTrialConfig_experiments_0[] = {
experiment_0_builder.Build(),
@ -287,7 +287,7 @@ TEST_F(FieldTrialUtilTest, FieldTrialConfigSkipOverridden) {
const char* disable_features_1[] = {"B"};
ExperimentBuilder experiment_1_builder;
experiment_1_builder.name = "TestGroup1";
experiment_1_builder.platforms = base::make_span(&platform, 1u);
experiment_1_builder.platforms = base::span_from_ref(platform);
experiment_1_builder.disable_features = disable_features_1;
const FieldTrialTestingExperiment array_kFieldTrialConfig_experiments_1[] = {
experiment_1_builder.Build(),
@ -297,7 +297,7 @@ TEST_F(FieldTrialUtilTest, FieldTrialConfigSkipOverridden) {
const char* disable_features_2[] = {"D"};
ExperimentBuilder experiment_2_builder;
experiment_2_builder.name = "TestGroup2";
experiment_2_builder.platforms = base::make_span(&platform, 1u);
experiment_2_builder.platforms = base::span_from_ref(platform);
experiment_0_builder.enable_features = enable_features2;
experiment_2_builder.disable_features = disable_features_2;
const FieldTrialTestingExperiment array_kFieldTrialConfig_experiments_2[] = {
@ -364,7 +364,7 @@ TEST_F(FieldTrialUtilTest,
const Study::Platform platform = all_platforms[i];
ExperimentBuilder experiment_builder;
experiment_builder.name = "TestGroup";
experiment_builder.platforms = base::make_span(&platform, 1u);
experiment_builder.platforms = base::span_from_ref(platform);
experiment_builder.params = array_kFieldTrialConfig_params;
const FieldTrialTestingExperiment array_kFieldTrialConfig_experiments[] = {
experiment_builder.Build(),
@ -401,7 +401,7 @@ TEST_F(FieldTrialUtilTest,
{{"x", "1"}, {"y", "2"}};
ExperimentBuilder experiment_builder;
experiment_builder.name = "TestGroup";
experiment_builder.platforms = base::make_span(&platform, 1u);
experiment_builder.platforms = base::span_from_ref(platform);
experiment_builder.params = array_kFieldTrialConfig_params;
const FieldTrialTestingExperiment array_kFieldTrialConfig_experiments[] = {
experiment_builder.Build(),
@ -476,7 +476,7 @@ TEST_F(FieldTrialUtilTest,
{{"x", "1"}, {"y", "2"}};
ExperimentBuilder experiment_builder;
experiment_builder.name = "TestGroup";
experiment_builder.platforms = base::make_span(&platform, 1u);
experiment_builder.platforms = base::span_from_ref(platform);
experiment_builder.form_factors = form_factors;
experiment_builder.params = array_kFieldTrialConfig_params;
const FieldTrialTestingExperiment array_kFieldTrialConfig_experiments[] = {
@ -514,8 +514,8 @@ TEST_F(FieldTrialUtilTest,
{{"x", "1"}, {"y", "2"}};
ExperimentBuilder experiment_builder;
experiment_builder.name = "TestGroup";
experiment_builder.platforms = base::make_span(&platform, 1u);
experiment_builder.form_factors = base::make_span(&form_factor, 1u);
experiment_builder.platforms = base::span_from_ref(platform);
experiment_builder.form_factors = base::span_from_ref(form_factor);
experiment_builder.params = array_kFieldTrialConfig_params;
const FieldTrialTestingExperiment array_kFieldTrialConfig_experiments[] = {
experiment_builder.Build(),
@ -563,8 +563,8 @@ TEST_F(FieldTrialUtilTest,
{{"x", "1"}, {"y", "2"}};
ExperimentBuilder experiment_builder;
experiment_builder.name = "TestGroup";
experiment_builder.platforms = base::make_span(&platform, 1u);
experiment_builder.form_factors = base::make_span(&form_factor, 1u);
experiment_builder.platforms = base::span_from_ref(platform);
experiment_builder.form_factors = base::span_from_ref(form_factor);
experiment_builder.params = array_kFieldTrialConfig_params;
const FieldTrialTestingExperiment array_kFieldTrialConfig_experiments[] = {
experiment_builder.Build(),
@ -602,18 +602,18 @@ TEST_F(FieldTrialUtilTest, AssociateFeaturesFromFieldTrialConfig) {
const Study::Platform platform = Study::PLATFORM_LINUX;
ExperimentBuilder study_0_experiment_0_builder;
study_0_experiment_0_builder.name = "TestGroup1";
study_0_experiment_0_builder.platforms = base::make_span(&platform, 1u);
study_0_experiment_0_builder.platforms = base::span_from_ref(platform);
study_0_experiment_0_builder.enable_features = enable_features;
const FieldTrialTestingExperiment array_kFieldTrialConfig_experiments_0[] = {
study_0_experiment_0_builder.Build(),
};
ExperimentBuilder study_1_experiment_0_builder;
study_1_experiment_0_builder.name = "TestGroup2";
study_1_experiment_0_builder.platforms = base::make_span(&platform, 1u);
study_1_experiment_0_builder.platforms = base::span_from_ref(platform);
study_1_experiment_0_builder.disable_features = disable_features;
ExperimentBuilder study_1_experiment_1_builder;
study_1_experiment_1_builder.name = "TestGroup2-2";
study_1_experiment_1_builder.platforms = base::make_span(&platform, 1u);
study_1_experiment_1_builder.platforms = base::span_from_ref(platform);
const FieldTrialTestingExperiment array_kFieldTrialConfig_experiments_1[] = {
study_1_experiment_0_builder.Build(),
study_1_experiment_1_builder.Build(),
@ -652,16 +652,16 @@ TEST_F(FieldTrialUtilTest, AssociateForcingFlagsFromFieldTrialConfig) {
const Study::Platform platform = Study::PLATFORM_LINUX;
ExperimentBuilder study_0_experiment_0_builder;
study_0_experiment_0_builder.name = "TestGroup1";
study_0_experiment_0_builder.platforms = base::make_span(&platform, 1u);
study_0_experiment_0_builder.platforms = base::span_from_ref(platform);
const FieldTrialTestingExperiment array_kFieldTrialConfig_experiments_0[] = {
study_0_experiment_0_builder.Build(),
};
ExperimentBuilder study_1_experiment_0_builder;
study_1_experiment_0_builder.name = "TestGroup2";
study_1_experiment_0_builder.platforms = base::make_span(&platform, 1u);
study_1_experiment_0_builder.platforms = base::span_from_ref(platform);
ExperimentBuilder study_1_experiment_1_builder;
study_1_experiment_1_builder.name = "ForcedGroup2";
study_1_experiment_1_builder.platforms = base::make_span(&platform, 1u);
study_1_experiment_1_builder.platforms = base::span_from_ref(platform);
study_1_experiment_1_builder.forcing_flag = "flag-2";
const FieldTrialTestingExperiment array_kFieldTrialConfig_experiments_1[] = {
study_1_experiment_0_builder.Build(),
@ -669,14 +669,14 @@ TEST_F(FieldTrialUtilTest, AssociateForcingFlagsFromFieldTrialConfig) {
};
ExperimentBuilder study_2_experiment_0_builder;
study_2_experiment_0_builder.name = "TestGroup3";
study_2_experiment_0_builder.platforms = base::make_span(&platform, 1u);
study_2_experiment_0_builder.platforms = base::span_from_ref(platform);
ExperimentBuilder study_2_experiment_1_builder;
study_2_experiment_1_builder.name = "ForcedGroup3";
study_2_experiment_1_builder.platforms = base::make_span(&platform, 1u);
study_2_experiment_1_builder.platforms = base::span_from_ref(platform);
study_2_experiment_1_builder.forcing_flag = "flag-3";
ExperimentBuilder study_2_experiment_2_builder;
study_2_experiment_2_builder.name = "ForcedGroup3-2";
study_2_experiment_2_builder.platforms = base::make_span(&platform, 1u);
study_2_experiment_2_builder.platforms = base::span_from_ref(platform);
study_2_experiment_2_builder.forcing_flag = "flag-3-2";
const FieldTrialTestingExperiment array_kFieldTrialConfig_experiments_2[] = {
study_2_experiment_0_builder.Build(),
@ -714,7 +714,7 @@ TEST_F(FieldTrialUtilTest,
{{1234, "test1"}, {5678, "test2"}};
ExperimentBuilder experiment_builder;
experiment_builder.name = "TestGroup";
experiment_builder.platforms = base::make_span(&platform, 1u);
experiment_builder.platforms = base::span_from_ref(platform);
experiment_builder.params = array_kFieldTrialConfig_params;
experiment_builder.override_ui_string =
array_kFieldTrialConfig_override_ui_string;
@ -760,7 +760,7 @@ TEST_F(FieldTrialUtilTest,
{"x", "1"}, {"y", "2"}};
ExperimentBuilder experiment_builder;
experiment_builder.name = "TestGroup";
experiment_builder.platforms = base::make_span(&platform, 1u);
experiment_builder.platforms = base::span_from_ref(platform);
experiment_builder.params = array_kFieldTrialConfig_params;
experiment_builder.is_low_end_device = base::SysInfo::IsLowEndDevice();
const FieldTrialTestingExperiment array_kFieldTrialConfig_experiments[] = {
@ -795,7 +795,7 @@ TEST_F(FieldTrialUtilTest,
{"x", "1"}, {"y", "2"}};
ExperimentBuilder experiment_builder;
experiment_builder.name = "TestGroup";
experiment_builder.platforms = base::make_span(&platform, 1u);
experiment_builder.platforms = base::span_from_ref(platform);
experiment_builder.params = array_kFieldTrialConfig_params;
experiment_builder.is_low_end_device = !base::SysInfo::IsLowEndDevice();
const FieldTrialTestingExperiment array_kFieldTrialConfig_experiments[] = {
@ -829,7 +829,7 @@ TEST_F(FieldTrialUtilTest,
{"x", "1"}, {"y", "2"}};
ExperimentBuilder experiment_builder;
experiment_builder.name = "TestGroup";
experiment_builder.platforms = base::make_span(&platform, 1u);
experiment_builder.platforms = base::span_from_ref(platform);
experiment_builder.params = array_kFieldTrialConfig_params;
experiment_builder.min_os_version = min_os_version.c_str();
const FieldTrialTestingExperiment array_kFieldTrialConfig_experiments[] = {
@ -868,7 +868,7 @@ TEST_F(FieldTrialUtilTest,
{"x", "1"}, {"y", "2"}};
ExperimentBuilder experiment_builder;
experiment_builder.name = "TestGroup";
experiment_builder.platforms = base::make_span(&platform, 1u);
experiment_builder.platforms = base::span_from_ref(platform);
experiment_builder.params = array_kFieldTrialConfig_params;
experiment_builder.min_os_version = min_os_version.c_str();
const FieldTrialTestingExperiment array_kFieldTrialConfig_experiments[] = {
@ -919,7 +919,7 @@ TEST_F(FieldTrialUtilTest,
Study::Platform platform = Study::PLATFORM_CHROMEOS;
ExperimentBuilder experiment_builder;
experiment_builder.name = "TestGroup";
experiment_builder.platforms = base::make_span(&platform, 1u);
experiment_builder.platforms = base::span_from_ref(platform);
experiment_builder.hardware_classes = classes;
FieldTrialTestingExperiment experiment = experiment_builder.Build();
@ -953,7 +953,7 @@ TEST_F(FieldTrialUtilTest,
Study::Platform platform = Study::PLATFORM_CHROMEOS;
ExperimentBuilder experiment_builder;
experiment_builder.name = "TestGroup";
experiment_builder.platforms = base::make_span(&platform, 1u);
experiment_builder.platforms = base::span_from_ref(platform);
experiment_builder.hardware_classes = classes;
FieldTrialTestingExperiment experiment = experiment_builder.Build();
@ -988,7 +988,7 @@ TEST_F(FieldTrialUtilTest,
Study::Platform platform = Study::PLATFORM_CHROMEOS;
ExperimentBuilder experiment_builder;
experiment_builder.name = "TestGroup";
experiment_builder.platforms = base::make_span(&platform, 1u);
experiment_builder.platforms = base::span_from_ref(platform);
experiment_builder.exclude_hardware_classes = classes;
FieldTrialTestingExperiment experiment = experiment_builder.Build();
@ -1022,7 +1022,7 @@ TEST_F(FieldTrialUtilTest,
Study::Platform platform = Study::PLATFORM_CHROMEOS;
ExperimentBuilder experiment_builder;
experiment_builder.name = "TestGroup";
experiment_builder.platforms = base::make_span(&platform, 1u);
experiment_builder.platforms = base::span_from_ref(platform);
experiment_builder.exclude_hardware_classes = classes;
FieldTrialTestingExperiment experiment = experiment_builder.Build();

2
content/browser/child_process_host_impl.cc

@ -324,7 +324,7 @@ uint64_t ChildProcessHostImpl::ChildProcessUniqueIdToTracingProcessId(
// The hash value is incremented so that the tracing id is never equal to
// MemoryDumpManager::kInvalidTracingProcessId.
return static_cast<uint64_t>(base::PersistentHash(
base::as_bytes(base::make_span(&child_process_id, 1u)))) +
base::as_bytes(base::span_from_ref(child_process_id)))) +
1;
}

2
content/zygote/zygote_linux.cc

@ -477,7 +477,7 @@ int Zygote::ForkWithRealPid(const std::string& process_type,
base::ProcessId real_pid;
if (!base::ReadFromFD(
read_pipe.get(),
base::as_writable_chars(base::make_span(&real_pid, 1u)))) {
base::as_writable_chars(base::span_from_ref(real_pid)))) {
LOG(FATAL) << "Failed to synchronise with parent zygote process";
}
if (real_pid <= 0) {

2
crypto/signature_verifier_unittest.cc

@ -386,7 +386,7 @@ TEST(SignatureVerifierTest, VerifyRSAPSS) {
ASSERT_TRUE(verifier.VerifyInit(crypto::SignatureVerifier::RSA_PSS_SHA256,
kPSSSignatureGood, kPSSPublicKey));
for (uint8_t b : kPSSMessage) {
verifier.VerifyUpdate(base::make_span(&b, 1u));
verifier.VerifyUpdate(base::span_from_ref(b));
}
EXPECT_TRUE(verifier.VerifyFinal());

2
device/gamepad/dualshock4_controller.cc

@ -127,7 +127,7 @@ uint32_t ComputeDualshock4Checksum(base::span<const uint8_t> report_data) {
// The Bluetooth report checksum includes a constant header byte not contained
// in the report data.
constexpr uint8_t bt_header = 0xa2;
uint32_t crc = base::Crc32(0xffffffff, base::make_span(&bt_header, 1u));
uint32_t crc = base::Crc32(0xffffffff, base::span_from_ref(bt_header));
// Extend the checksum with the contents of the report.
return ~base::Crc32(crc, report_data);
}

2
media/filters/chunk_demuxer_unittest.cc

@ -2257,7 +2257,7 @@ TEST_F(ChunkDemuxerTest, ParseErrorDuringInit) {
EXPECT_MEDIA_LOG(StreamParsingFailed());
uint8_t tmp = 0;
ASSERT_FALSE(AppendData(base::make_span(&tmp, 1u)));
ASSERT_FALSE(AppendData(base::span_from_ref(tmp)));
}
TEST_F(ChunkDemuxerTest, AVHeadersWithAudioOnlyType) {

2
net/disk_cache/backend_unittest.cc

@ -4094,7 +4094,7 @@ TEST_F(DiskCacheBackendTest, SimpleCacheOpenBadFile) {
disk_cache::SimpleFileHeader header;
header.initial_magic_number = UINT64_C(0xbadf00d);
EXPECT_TRUE(base::WriteFile(entry_file1_path,
base::as_bytes(base::make_span(&header, 1u))));
base::as_bytes(base::span_from_ref(header))));
ASSERT_THAT(OpenEntry(key, &entry), IsError(net::ERR_FAILED));
}

10
net/disk_cache/blockfile/sparse_control.cc

@ -417,7 +417,7 @@ int SparseControl::CreateSparseEntry() {
// Save the header. The bitmap is saved in the destructor.
scoped_refptr<net::IOBuffer> buf = base::MakeRefCounted<net::WrappedIOBuffer>(
base::as_chars(base::make_span(&sparse_header_, 1u)));
base::as_chars(base::span_from_ref(sparse_header_)));
int rv = entry_->WriteData(kSparseIndex, 0, buf.get(), sizeof(sparse_header_),
CompletionOnceCallback(), false);
@ -447,7 +447,7 @@ int SparseControl::OpenSparseEntry(int data_len) {
return net::ERR_CACHE_OPERATION_NOT_SUPPORTED;
scoped_refptr<net::IOBuffer> buf = base::MakeRefCounted<net::WrappedIOBuffer>(
base::as_chars(base::span(&sparse_header_, 1u)));
base::as_chars(base::span_from_ref(sparse_header_)));
// Read header.
int rv = entry_->ReadData(kSparseIndex, 0, buf.get(), sizeof(sparse_header_),
@ -502,7 +502,7 @@ bool SparseControl::OpenChild() {
return KillChildAndContinue(key, false);
auto buf = base::MakeRefCounted<net::WrappedIOBuffer>(
base::as_chars(base::make_span(&child_data_, 1u)));
base::as_chars(base::span_from_ref(child_data_)));
// Read signature.
int rv = child_->ReadData(kSparseIndex, 0, buf.get(), sizeof(child_data_),
@ -526,7 +526,7 @@ bool SparseControl::OpenChild() {
void SparseControl::CloseChild() {
auto buf = base::MakeRefCounted<net::WrappedIOBuffer>(
base::as_chars(base::make_span(&child_data_, 1u)));
base::as_chars(base::span_from_ref(child_data_)));
// Save the allocation bitmap before closing the child entry.
int rv = child_->WriteData(kSparseIndex, 0, buf.get(), sizeof(child_data_),
@ -691,7 +691,7 @@ void SparseControl::InitChildData() {
child_data_.header = sparse_header_;
auto buf = base::MakeRefCounted<net::WrappedIOBuffer>(
base::as_chars(base::make_span(&child_data_, 1u)));
base::as_chars(base::span_from_ref(child_data_)));
int rv = child_->WriteData(kSparseIndex, 0, buf.get(), sizeof(child_data_),
CompletionOnceCallback(), false);

6
net/disk_cache/simple/simple_version_upgrade_unittest.cc

@ -45,7 +45,7 @@ bool WriteFakeIndexFileV5(const base::FilePath& cache_path) {
data.zero = 0;
data.zero2 = 0;
const base::FilePath file_name = cache_path.AppendASCII("index");
return base::WriteFile(file_name, base::as_bytes(base::make_span(&data, 1u)));
return base::WriteFile(file_name, base::as_bytes(base::span_from_ref(data)));
}
TEST(SimpleVersionUpgradeTest, FailsToMigrateBackwards) {
@ -60,7 +60,7 @@ TEST(SimpleVersionUpgradeTest, FailsToMigrateBackwards) {
data.zero2 = 0;
const base::FilePath file_name = cache_path.AppendASCII(kFakeIndexFileName);
ASSERT_TRUE(
base::WriteFile(file_name, base::as_bytes(base::make_span(&data, 1u))));
base::WriteFile(file_name, base::as_bytes(base::span_from_ref(data))));
disk_cache::TrivialFileOperations file_operations;
EXPECT_EQ(disk_cache::SimpleCacheConsistencyResult::kVersionFromTheFuture,
disk_cache::UpgradeSimpleCacheOnDisk(&file_operations,
@ -79,7 +79,7 @@ TEST(SimpleVersionUpgradeTest, ExperimentBacktoDefault) {
data.zero2 = 4;
const base::FilePath file_name = cache_path.AppendASCII(kFakeIndexFileName);
ASSERT_TRUE(
base::WriteFile(file_name, base::as_bytes(base::make_span(&data, 1u))));
base::WriteFile(file_name, base::as_bytes(base::span_from_ref(data))));
disk_cache::TrivialFileOperations file_operations;
// The cache needs to transition from a deprecated experiment back to not

34
net/http/http_stream_factory_unittest.cc

@ -1309,7 +1309,7 @@ TEST_F(HttpStreamFactoryTest, ReprioritizeAfterStreamReceived) {
session_deps.host_resolver->set_synchronous_mode(true);
MockRead mock_read(SYNCHRONOUS, ERR_IO_PENDING);
StaticSocketDataProvider socket_data(base::make_span(&mock_read, 1u),
StaticSocketDataProvider socket_data(base::span_from_ref(mock_read),
base::span<MockWrite>());
socket_data.set_connect_data(MockConnect(SYNCHRONOUS, OK));
session_deps.socket_factory->AddSocketDataProvider(&socket_data);
@ -1358,7 +1358,7 @@ TEST_F(HttpStreamFactoryTest, RequestHttpStreamOverSSL) {
ConfiguredProxyResolutionService::CreateDirect());
MockRead mock_read(ASYNC, OK);
StaticSocketDataProvider socket_data(base::make_span(&mock_read, 1u),
StaticSocketDataProvider socket_data(base::span_from_ref(mock_read),
base::span<MockWrite>());
socket_data.set_connect_data(MockConnect(ASYNC, OK));
session_deps.socket_factory->AddSocketDataProvider(&socket_data);
@ -1489,7 +1489,7 @@ TEST_F(HttpStreamFactoryTest, RequestWebSocketBasicHandshakeStreamOverSSL) {
ConfiguredProxyResolutionService::CreateDirect());
MockRead mock_read(ASYNC, OK);
StaticSocketDataProvider socket_data(base::make_span(&mock_read, 1u),
StaticSocketDataProvider socket_data(base::span_from_ref(mock_read),
base::span<MockWrite>());
socket_data.set_connect_data(MockConnect(ASYNC, OK));
session_deps.socket_factory->AddSocketDataProvider(&socket_data);
@ -1581,7 +1581,7 @@ TEST_F(HttpStreamFactoryTest, RequestSpdyHttpStreamHttpsURL) {
ConfiguredProxyResolutionService::CreateDirect());
MockRead mock_read(SYNCHRONOUS, ERR_IO_PENDING);
SequencedSocketData socket_data(base::make_span(&mock_read, 1u),
SequencedSocketData socket_data(base::span_from_ref(mock_read),
base::span<MockWrite>());
socket_data.set_connect_data(MockConnect(ASYNC, OK));
session_deps.socket_factory->AddSocketDataProvider(&socket_data);
@ -1630,7 +1630,7 @@ TEST_F(HttpStreamFactoryTest, RequestSpdyHttpStreamHttpURL) {
"HTTPS myproxy.org:443", TRAFFIC_ANNOTATION_FOR_TESTS);
MockRead mock_read(SYNCHRONOUS, ERR_IO_PENDING);
SequencedSocketData socket_data(base::make_span(&mock_read, 1u),
SequencedSocketData socket_data(base::span_from_ref(mock_read),
base::span<MockWrite>());
socket_data.set_connect_data(MockConnect(ASYNC, OK));
session_deps->socket_factory->AddSocketDataProvider(&socket_data);
@ -1703,7 +1703,7 @@ TEST_F(HttpStreamFactoryTest,
"HTTPS myproxy.org:443", TRAFFIC_ANNOTATION_FOR_TESTS);
MockRead mock_read(SYNCHRONOUS, ERR_IO_PENDING);
SequencedSocketData socket_data(base::make_span(&mock_read, 1u),
SequencedSocketData socket_data(base::span_from_ref(mock_read),
base::span<MockWrite>());
socket_data.set_connect_data(MockConnect(ASYNC, OK));
session_deps->socket_factory->AddSocketDataProvider(&socket_data);
@ -1918,7 +1918,7 @@ TEST_F(HttpStreamFactoryTest, RequestBidirectionalStreamImpl) {
ConfiguredProxyResolutionService::CreateDirect());
MockRead mock_read(ASYNC, OK);
SequencedSocketData socket_data(base::make_span(&mock_read, 1u),
SequencedSocketData socket_data(base::span_from_ref(mock_read),
base::span<MockWrite>());
socket_data.set_connect_data(MockConnect(ASYNC, OK));
session_deps.socket_factory->AddSocketDataProvider(&socket_data);
@ -2692,7 +2692,7 @@ TEST_F(HttpStreamFactoryTest, RequestBidirectionalStreamImplFailure) {
ConfiguredProxyResolutionService::CreateDirect());
MockRead mock_read(ASYNC, OK);
SequencedSocketData socket_data(base::make_span(&mock_read, 1u),
SequencedSocketData socket_data(base::span_from_ref(mock_read),
base::span<MockWrite>());
socket_data.set_connect_data(MockConnect(ASYNC, OK));
session_deps.socket_factory->AddSocketDataProvider(&socket_data);
@ -2743,12 +2743,12 @@ TEST_F(HttpStreamFactoryTest, Tag) {
// Prepare for two HTTPS connects.
MockRead mock_read(SYNCHRONOUS, ERR_IO_PENDING);
SequencedSocketData socket_data(base::make_span(&mock_read, 1u),
SequencedSocketData socket_data(base::span_from_ref(mock_read),
base::span<MockWrite>());
socket_data.set_connect_data(MockConnect(ASYNC, OK));
session_deps.socket_factory->AddSocketDataProvider(&socket_data);
MockRead mock_read2(SYNCHRONOUS, ERR_IO_PENDING);
SequencedSocketData socket_data2(base::make_span(&mock_read2, 1u),
SequencedSocketData socket_data2(base::span_from_ref(mock_read2),
base::span<MockWrite>());
socket_data2.set_connect_data(MockConnect(ASYNC, OK));
session_deps.socket_factory->AddSocketDataProvider(&socket_data2);
@ -2995,12 +2995,12 @@ TEST_F(HttpStreamFactoryTest, ChangeSocketTag) {
// Prepare for two HTTPS connects.
MockRead mock_read(SYNCHRONOUS, ERR_IO_PENDING);
SequencedSocketData socket_data(base::make_span(&mock_read, 1u),
SequencedSocketData socket_data(base::span_from_ref(mock_read),
base::span<MockWrite>());
socket_data.set_connect_data(MockConnect(ASYNC, OK));
session_deps.socket_factory->AddSocketDataProvider(&socket_data);
MockRead mock_read2(SYNCHRONOUS, ERR_IO_PENDING);
SequencedSocketData socket_data2(base::make_span(&mock_read2, 1u),
SequencedSocketData socket_data2(base::span_from_ref(mock_read2),
base::span<MockWrite>());
socket_data2.set_connect_data(MockConnect(ASYNC, OK));
session_deps.socket_factory->AddSocketDataProvider(&socket_data2);
@ -3177,12 +3177,12 @@ TEST_F(HttpStreamFactoryTest, ChangeSocketTagAvoidOverwrite) {
// Prepare for two HTTPS connects.
MockRead mock_read(SYNCHRONOUS, ERR_IO_PENDING);
SequencedSocketData socket_data(base::make_span(&mock_read, 1u),
SequencedSocketData socket_data(base::span_from_ref(mock_read),
base::span<MockWrite>());
socket_data.set_connect_data(MockConnect(ASYNC, OK));
session_deps.socket_factory->AddSocketDataProvider(&socket_data);
MockRead mock_read2(SYNCHRONOUS, ERR_IO_PENDING);
SequencedSocketData socket_data2(base::make_span(&mock_read2, 1u),
SequencedSocketData socket_data2(base::span_from_ref(mock_read2),
base::span<MockWrite>());
socket_data2.set_connect_data(MockConnect(ASYNC, OK));
session_deps.socket_factory->AddSocketDataProvider(&socket_data2);
@ -3352,12 +3352,12 @@ TEST_F(HttpStreamFactoryTest, MultiIPAliases) {
// Prepare for two HTTPS connects.
MockRead mock_read1(SYNCHRONOUS, ERR_IO_PENDING);
SequencedSocketData socket_data1(base::make_span(&mock_read1, 1u),
SequencedSocketData socket_data1(base::span_from_ref(mock_read1),
base::span<MockWrite>());
socket_data1.set_connect_data(MockConnect(ASYNC, OK));
session_deps.socket_factory->AddSocketDataProvider(&socket_data1);
MockRead mock_read2(SYNCHRONOUS, ERR_IO_PENDING);
SequencedSocketData socket_data2(base::make_span(&mock_read2, 1u),
SequencedSocketData socket_data2(base::span_from_ref(mock_read2),
base::span<MockWrite>());
socket_data2.set_connect_data(MockConnect(ASYNC, OK));
session_deps.socket_factory->AddSocketDataProvider(&socket_data2);
@ -3502,7 +3502,7 @@ TEST_F(HttpStreamFactoryTest, SpdyIPPoolingWithDnsAliases) {
// Prepare for an HTTPS connect.
MockRead mock_read(SYNCHRONOUS, ERR_IO_PENDING);
SequencedSocketData socket_data(base::make_span(&mock_read, 1u),
SequencedSocketData socket_data(base::span_from_ref(mock_read),
base::span<MockWrite>());
socket_data.set_connect_data(MockConnect(ASYNC, OK));
session_deps.socket_factory->AddSocketDataProvider(&socket_data);

2
net/quic/crypto/proof_verifier_chromium.cc

@ -490,7 +490,7 @@ bool ProofVerifierChromium::Job::VerifySignature(
verifier.VerifyUpdate(base::as_byte_span(quic::kProofSignatureLabel));
uint32_t len = chlo_hash.length();
verifier.VerifyUpdate(base::as_bytes(base::make_span(&len, 1u)));
verifier.VerifyUpdate(base::as_bytes(base::span_from_ref(len)));
verifier.VerifyUpdate(base::as_byte_span(chlo_hash));
verifier.VerifyUpdate(base::as_byte_span(signed_data));

2
net/quic/quic_session_pool_test.cc

@ -12924,7 +12924,7 @@ class QuicSessionPoolWithDestinationTest
void AddHangingSocketData() {
auto sequenced_socket_data = std::make_unique<SequencedSocketData>(
base::make_span(&hanging_read_, 1u), base::span<MockWrite>());
base::span_from_ref(hanging_read_), base::span<MockWrite>());
socket_factory_->AddSocketDataProvider(sequenced_socket_data.get());
sequenced_socket_data_vector_.push_back(std::move(sequenced_socket_data));
}

6
net/socket/transport_connect_job_unittest.cc

@ -511,7 +511,7 @@ TEST_F(TransportConnectJobTest, EndpointResult) {
MockTransportClientSocketFactory::Rule rule(
MockTransportClientSocketFactory::Type::kSynchronous,
std::vector{IPEndPoint(ParseIP("1::"), 8443)});
client_socket_factory_.SetRules(base::make_span(&rule, 1u));
client_socket_factory_.SetRules(base::span_from_ref(rule));
TestConnectJobDelegate test_delegate;
TransportConnectJob transport_connect_job(
@ -666,7 +666,7 @@ TEST_F(TransportConnectJobTest, MultipleRoutesSuspended) {
MockTransportClientSocketFactory::Rule rule(
MockTransportClientSocketFactory::Type::kFailing,
endpoints[0].ip_endpoints, ERR_NETWORK_IO_SUSPENDED);
client_socket_factory_.SetRules(base::make_span(&rule, 1u));
client_socket_factory_.SetRules(base::span_from_ref(rule));
TestConnectJobDelegate test_delegate;
TransportConnectJob transport_connect_job(
@ -703,7 +703,7 @@ TEST_F(TransportConnectJobTest, NoAlpnProtocols) {
MockTransportClientSocketFactory::Rule rule(
MockTransportClientSocketFactory::Type::kSynchronous,
std::vector{endpoints[2].ip_endpoints[0]});
client_socket_factory_.SetRules(base::make_span(&rule, 1u));
client_socket_factory_.SetRules(base::span_from_ref(rule));
// Use `DefaultParams()`, an http scheme. That it is http is not very
// important, but `url::SchemeHostPort` is difficult to use with unknown

4
net/socket/websocket_transport_client_socket_pool_unittest.cc

@ -931,7 +931,7 @@ TEST_F(WebSocketTransportClientSocketPoolTest, Suspend) {
MockTransportClientSocketFactory::Type::kFailing,
std::vector{IPEndPoint(ParseIP("1:abcd::3:4:ff"), 80)},
ERR_NETWORK_IO_SUSPENDED);
client_socket_factory_.SetRules(base::make_span(&rule, 1u));
client_socket_factory_.SetRules(base::span_from_ref(rule));
TestCompletionCallback callback;
ClientSocketHandle handle;
@ -962,7 +962,7 @@ TEST_F(WebSocketTransportClientSocketPoolTest, SuspendAsync) {
MockTransportClientSocketFactory::Type::kPendingFailing,
std::vector{IPEndPoint(ParseIP("1:abcd::3:4:ff"), 80)},
ERR_NETWORK_IO_SUSPENDED);
client_socket_factory_.SetRules(base::make_span(&rule, 1u));
client_socket_factory_.SetRules(base::span_from_ref(rule));
TestCompletionCallback callback;
ClientSocketHandle handle;

6
services/device/hid/hid_service_linux_unittest.cc

@ -78,7 +78,7 @@ TEST_F(HidServiceLinuxTest, EnumerateUsbHidDevice) {
uint8_t data = 0;
ASSERT_TRUE(base::CreateDirectory(hid_path));
ASSERT_TRUE(
base::WriteFile(report_descriptor_path, base::make_span(&data, 1u)));
base::WriteFile(report_descriptor_path, base::span_from_ref(data)));
// Add the fake HID device as well as its ancestors up to the USB device node.
// Ancestors must be added starting from the closest to the root to ensure
@ -147,7 +147,7 @@ TEST_F(HidServiceLinuxTest, EnumerateBluetoothClassicHidDevice) {
uint8_t data = 0;
ASSERT_TRUE(base::CreateDirectory(hid_path));
ASSERT_TRUE(
base::WriteFile(report_descriptor_path, base::make_span(&data, 1u)));
base::WriteFile(report_descriptor_path, base::span_from_ref(data)));
// Add the fake HID device as well as its ancestors up to the Bluetooth link.
// Ancestors must be added starting from the closest to the root to ensure
@ -212,7 +212,7 @@ TEST_F(HidServiceLinuxTest, EnumerateBleHidDevice) {
uint8_t data = 0;
ASSERT_TRUE(base::CreateDirectory(hid_path));
ASSERT_TRUE(
base::WriteFile(report_descriptor_path, base::make_span(&data, 1u)));
base::WriteFile(report_descriptor_path, base::span_from_ref(data)));
// Add the fake HID device as well as its ancestors up to the Bluetooth link.
// Ancestors must be added starting from the closest to the root to ensure

4
testing/libfuzzer/fuzzilli/fuzzilli_driver.cc

@ -77,7 +77,7 @@ int LLVMFuzzerRunDriverImpl(int* argc,
// Read the size of the JavaScript script from Fuzzilli.
uint64_t script_size = 0;
ctrl_read_file.ReadAtCurrentPosAndCheck(
base::as_writable_bytes(base::make_span(&script_size, 1u)));
base::as_writable_bytes(base::span_from_ref(script_size)));
// Read the JavaScript script from Fuzzilli.
std::vector<uint8_t> buffer(script_size + 1);
@ -91,7 +91,7 @@ int LLVMFuzzerRunDriverImpl(int* argc,
// Fuzzilli status is similar to the Linux return status. Lower 8 bits are
// used for signals, and higher 8 bits for return code.
ctrl_write_file.WriteAtCurrentPosAndCheck(
base::as_bytes(base::make_span(&status, 1u)));
base::as_bytes(base::span_from_ref(status)));
// After every iteration, we reset the coverage edges so that we can mark
// which edges are hit in the next iteration. This is needed by Fuzzilli

2
third_party/blink/renderer/core/frame/web_frame_test.cc vendored

@ -307,7 +307,7 @@ void ExecuteScriptInMainWorld(
mojom::blink::PromiseResultOption::kAwait,
mojom::blink::UserActivationOption user_gesture =
mojom::blink::UserActivationOption::kDoNotActivate) {
ExecuteScriptsInMainWorld(frame, base::make_span(&script_string, 1u),
ExecuteScriptsInMainWorld(frame, base::span_from_ref(script_string),
std::move(callback), wait_for_promise,
user_gesture);
}

2
third_party/blink/renderer/core/scheduler_integration_tests/virtual_time_test.cc vendored

@ -57,7 +57,7 @@ class VirtualTimeTest : public SimTest {
ScriptExecutionCallbackHelper callback_helper;
WebScriptSource source(script_source);
WebView().MainFrame()->ToWebLocalFrame()->RequestExecuteScript(
DOMWrapperWorld::kMainWorldId, base::make_span(&source, 1u),
DOMWrapperWorld::kMainWorldId, base::span_from_ref(source),
mojom::blink::UserActivationOption::kDoNotActivate,
mojom::blink::EvaluationTiming::kSynchronous,
mojom::blink::LoadEventBlockingOption::kDoNotBlock,

2
third_party/blink/renderer/modules/media_capabilities/media_capabilities.cc vendored

@ -539,7 +539,7 @@ bool CheckMseSupport(const String& mime_type, const String& codec) {
const std::string codec_ascii = codec.Ascii();
if (!codec.Ascii().empty())
codecs = base::make_span(&codec_ascii, 1u);
codecs = base::span_from_ref(codec_ascii);
if (media::SupportsType::kSupported !=
media::StreamParserFactory::IsTypeSupported(mime_type.Ascii(), codecs)) {

2
third_party/blink/renderer/platform/image-decoders/image_decoder_base_test.cc vendored

@ -73,7 +73,7 @@ void SaveMD5Sum(const base::FilePath& path,
// Write sum to disk.
ASSERT_TRUE(
base::WriteFile(path, base::as_bytes(base::make_span(&digest, 1u))));
base::WriteFile(path, base::as_bytes(base::span_from_ref(digest))));
}
#endif