Use base::size rather than arraysize in net/.
BUG=837308
Change-Id: Icc80e825ba0cee5d5a828aedf0ab7636824d903f
Reviewed-on: https://chromium-review.googlesource.com/c/1390419
Reviewed-by: Eric Roman <[email protected]>
Commit-Queue: Avi Drissman <[email protected]>
Cr-Commit-Position: refs/heads/master@{#619176}diff --git a/net/quic/quic_chromium_client_stream_test.cc b/net/quic/quic_chromium_client_stream_test.cc
index f495b1b9..979be06 100644
--- a/net/quic/quic_chromium_client_stream_test.cc
+++ b/net/quic/quic_chromium_client_stream_test.cc
@@ -8,6 +8,7 @@
#include "base/memory/ptr_util.h"
#include "base/run_loop.h"
+#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
#include "net/base/io_buffer.h"
#include "net/base/net_errors.h"
@@ -297,7 +298,7 @@
handle_->OnFinRead();
const char kData1[] = "hello world";
- const size_t kDataLen = arraysize(kData1);
+ const size_t kDataLen = base::size(kData1);
// All data written.
EXPECT_CALL(session_, WritevData(stream_, stream_->id(), _, _, _))
@@ -624,7 +625,7 @@
TEST_P(QuicChromiumClientStreamTest, WriteStreamData) {
const char kData1[] = "hello world";
- const size_t kDataLen = arraysize(kData1);
+ const size_t kDataLen = base::size(kData1);
// All data written.
EXPECT_CALL(session_, WritevData(stream_, stream_->id(), _, _, _))
@@ -637,7 +638,7 @@
TEST_P(QuicChromiumClientStreamTest, WriteStreamDataAsync) {
const char kData1[] = "hello world";
- const size_t kDataLen = arraysize(kData1);
+ const size_t kDataLen = base::size(kData1);
// No data written.
EXPECT_CALL(session_, WritevData(stream_, stream_->id(), _, _, _))
@@ -752,7 +753,7 @@
base::RunLoop().RunUntilIdle();
// Now explicitly read the data.
- int data_len = arraysize(data) - 1;
+ int data_len = base::size(data) - 1;
scoped_refptr<IOBuffer> buffer = base::MakeRefCounted<IOBuffer>(data_len + 1);
ASSERT_EQ(data_len, stream2->Read(buffer.get(), data_len + 1));
EXPECT_EQ(quic::QuicStringPiece(data),
diff --git a/net/quic/quic_http_stream_test.cc b/net/quic/quic_http_stream_test.cc
index d01cfb162..54e53b6 100644
--- a/net/quic/quic_http_stream_test.cc
+++ b/net/quic/quic_http_stream_test.cc
@@ -11,6 +11,7 @@
#include "base/memory/ptr_util.h"
#include "base/run_loop.h"
+#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/threading/thread_task_runner_handle.h"
#include "base/time/time.h"
@@ -1336,7 +1337,7 @@
stream_->ReadResponseBody(read_buffer_.get(), read_buffer_->size(),
callback_.callback()));
ProcessPacket(ConstructServerDataPacket(4, false, kFin,
- arraysize(kResponseBody) - 1, ""));
+ base::size(kResponseBody) - 1, ""));
EXPECT_EQ(0,
stream_->ReadResponseBody(read_buffer_.get(), read_buffer_->size(),
callback_.callback()));
diff --git a/net/quic/quic_stream_factory_fuzzer.cc b/net/quic/quic_stream_factory_fuzzer.cc
index 6e4f9d06..5be455ff 100644
--- a/net/quic/quic_stream_factory_fuzzer.cc
+++ b/net/quic/quic_stream_factory_fuzzer.cc
@@ -6,6 +6,7 @@
#include "base/test/fuzzed_data_provider.h"
+#include "base/stl_util.h"
#include "net/base/test_completion_callback.h"
#include "net/cert/ct_policy_enforcer.h"
#include "net/cert/do_nothing_ct_verifier.h"
@@ -57,7 +58,7 @@
cert_verifier = std::make_unique<MockCertVerifier>();
cert_transparency_verifier = std::make_unique<DoNothingCTVerifier>();
verify_details.cert_verify_result.verified_cert =
- X509Certificate::CreateFromBytes(kCertData, arraysize(kCertData));
+ X509Certificate::CreateFromBytes(kCertData, base::size(kCertData));
CHECK(verify_details.cert_verify_result.verified_cert);
verify_details.cert_verify_result.is_issued_by_known_root = true;
}
