Use base::MakeRefCounted instead of new to alloc net::IOBuffer instances.
This CL only handles the files in //net. The files outside of //net are
tackled separately, in https://crrev.com/c/1189548.
net::IOBuffer is (thread-safe) ref-counted. Asides from improving the
ability to reason about instance ownership locally, creating instances
via base::MakeRefCounted makes it possible to use 1-based ref-counting
in the future (see base/memory/ref_counted.h).
This CL is mechanical, to avoid introducing any behavior changes. The
difficult cases will be tackled by follow-up CLs. The following
transformations were performed.
* new IOBufferType(args) => base::MakeRefCounted<IOBufferType>(args)
* new IOBufferType => base::MakeRefCounted<IOBufferType>()
* scoped_refptr x(base::MakeRefCounted<IOBufferType>(args)) =>
scoped_refptr x = base::MakeRefCounted<IOBufferType>(args)
* scoped_refptr<IOBufferType>(base::MakeRefCounted<IOBufferType>(args)) =>
base::MakeRefCounted<IOBufferType>(args)
* In comments: creates a new IOBufferType => creates an IOBufferType
(so it wouldn't trigger future searches for "new BufferType")
* Instantiated static members in HttpResponseBodyDrainer,
HttpNetworkTransaction, HttpProxyClientSocket, WritersTest,
UDPSocketTest, TestDelegate, UDPSocketPerfTest
(needed to fix linker errors)
* arraysize -> base::size (where needed to pass presubmit checks)
* git cl format
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:ios-simulator-cronet;luci.chromium.try:ios-simulator-full-configs;luci.chromium.try:linux_mojo;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel;master.tryserver.chromium.android:android_cronet_tester
Change-Id: Ic2cf8eb4dccfa4a97be893aff9a6053eaaf7d7af
Reviewed-on: https://chromium-review.googlesource.com/1188959
Reviewed-by: Bence Béky <[email protected]>
Commit-Queue: Victor Costan <[email protected]>
Cr-Commit-Position: refs/heads/master@{#586281}
diff --git a/net/test/tcp_socket_proxy_unittest.cc b/net/test/tcp_socket_proxy_unittest.cc
index 864404c..8a33129 100644
--- a/net/test/tcp_socket_proxy_unittest.cc
+++ b/net/test/tcp_socket_proxy_unittest.cc
@@ -69,14 +69,15 @@
// Read().
char test_message = '0';
- scoped_refptr<IOBuffer> write_buffer = new IOBuffer(1);
+ scoped_refptr<IOBuffer> write_buffer = base::MakeRefCounted<IOBuffer>(1);
*write_buffer->data() = test_message;
TestCompletionCallback write_callback;
int write_result =
socket1->Write(write_buffer.get(), 1, write_callback.callback(),
TRAFFIC_ANNOTATION_FOR_TESTS);
- scoped_refptr<IOBufferWithSize> read_buffer(new IOBufferWithSize(1024));
+ scoped_refptr<IOBufferWithSize> read_buffer =
+ base::MakeRefCounted<IOBufferWithSize>(1024);
TestCompletionCallback read_callback;
int read_result = socket2->Read(read_buffer.get(), read_buffer->size(),
read_callback.callback());
@@ -88,7 +89,8 @@
}
void ExpectClosed(StreamSocket* socket) {
- scoped_refptr<IOBufferWithSize> read_buffer(new IOBufferWithSize(1024));
+ scoped_refptr<IOBufferWithSize> read_buffer =
+ base::MakeRefCounted<IOBufferWithSize>(1024);
TestCompletionCallback read_callback;
int read_result = socket->Read(read_buffer.get(), read_buffer->size(),
read_callback.callback());