From d54000b2039c3b4c9d3fb8e9133da4705eee5a6e Mon Sep 17 00:00:00 2001 From: Jeremy Roman Date: Mon, 8 Jul 2019 18:40:16 +0000 Subject: [PATCH] Use in-class initializers for base::WeakPtrFactory in net/. Generated by: https://chromium-review.googlesource.com/c/chromium/src/+/1689216 Bug: 981415 Change-Id: I8b3e41ce53df33f8fc201e175a65cae3a9e07669 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1691082 Reviewed-by: Eric Roman Commit-Queue: Jeremy Roman Cr-Commit-Position: refs/heads/master@{#675307} --- net/base/chunked_upload_data_stream.cc | 3 +-- net/base/chunked_upload_data_stream.h | 2 +- net/base/elements_upload_data_stream.cc | 3 +-- net/base/elements_upload_data_stream.h | 2 +- net/base/mock_file_stream.cc | 7 ++----- net/base/mock_file_stream.h | 2 +- net/base/upload_file_element_reader.cc | 6 ++---- net/base/upload_file_element_reader.h | 2 +- net/cert/mock_cert_verifier.cc | 4 ++-- net/cert/multi_threaded_cert_verifier.cc | 5 ++--- net/cert/nss_cert_database.cc | 3 +-- net/cert/nss_cert_database.h | 2 +- net/cookies/cookie_monster.cc | 3 +-- net/cookies/cookie_monster.h | 2 +- net/cookies/cookie_monster_change_dispatcher.cc | 6 ++---- net/cookies/cookie_monster_change_dispatcher.h | 4 ++-- net/disk_cache/blockfile/backend_impl.cc | 6 ++---- net/disk_cache/blockfile/backend_impl.h | 2 +- net/disk_cache/blockfile/eviction.cc | 2 +- net/disk_cache/blockfile/eviction.h | 2 +- net/disk_cache/blockfile/in_flight_backend_io.cc | 5 +---- net/disk_cache/blockfile/in_flight_backend_io.h | 2 +- net/disk_cache/memory/mem_backend_impl.cc | 3 +-- net/disk_cache/memory/mem_backend_impl.h | 2 +- net/disk_cache/simple/simple_backend_impl.cc | 6 ++---- net/dns/dns_config_service_posix.cc | 5 ++--- net/dns/dns_socket_pool_unittest.cc | 4 ++-- net/dns/dns_transaction.cc | 6 ++---- net/dns/dns_transaction_unittest.cc | 5 ++--- net/dns/fuzzed_host_resolver_util.cc | 5 ++--- net/dns/host_resolver_manager.cc | 14 +++++--------- net/dns/host_resolver_manager.h | 4 ++-- net/dns/host_resolver_mdns_task.cc | 2 +- net/dns/host_resolver_mdns_task.h | 2 +- net/dns/mdns_client_impl.cc | 3 +-- net/dns/mdns_client_impl.h | 2 +- net/dns/serial_worker.cc | 3 +-- net/dns/serial_worker.h | 2 +- net/dns/system_dns_config_change_notifier.cc | 10 ++++------ .../sqlite_persistent_reporting_and_nel_store.cc | 3 +-- .../sqlite_persistent_reporting_and_nel_store.h | 3 ++- net/http/bidirectional_stream.cc | 3 +-- net/http/bidirectional_stream.h | 2 +- net/http/broken_alternative_services.cc | 2 +- net/http/broken_alternative_services.h | 2 +- net/http/http_auth_handler_mock.cc | 3 +-- net/http/http_auth_handler_mock.h | 2 +- net/http/http_cache.cc | 3 +-- net/http/http_cache.h | 2 +- net/http/http_cache_lookup_manager.cc | 2 +- net/http/http_cache_lookup_manager.h | 2 +- net/http/http_cache_transaction.cc | 3 +-- net/http/http_cache_transaction.h | 2 +- net/http/http_cache_writers.cc | 2 +- net/http/http_cache_writers.h | 2 +- net/http/http_proxy_connect_job.cc | 3 +-- net/http/http_proxy_connect_job.h | 2 +- net/http/http_response_body_drainer_unittest.cc | 5 ++--- net/http/http_stream_factory_job.cc | 3 +-- net/http/http_stream_factory_job.h | 2 +- net/http/http_stream_factory_job_controller.cc | 7 +++---- net/http/http_stream_factory_job_controller.h | 2 +- net/http/http_stream_factory_unittest.cc | 5 ++--- net/http/http_stream_parser.cc | 3 +-- net/http/http_stream_parser.h | 2 +- net/http/http_stream_parser_unittest.cc | 8 ++++---- net/http/http_transaction_test_util.cc | 3 +-- net/http/http_transaction_test_util.h | 3 +-- net/http/partial_data.cc | 3 +-- net/http/partial_data.h | 2 +- net/http/transport_security_persister.cc | 3 +-- net/http/transport_security_persister.h | 2 +- net/log/trace_net_log_observer.cc | 3 +-- net/log/trace_net_log_observer.h | 2 +- .../network_error_logging_service.cc | 7 ++----- net/nqe/network_quality_estimator.cc | 3 +-- net/nqe/network_quality_estimator.h | 2 +- net/nqe/network_quality_store.cc | 2 +- net/nqe/network_quality_store.h | 2 +- net/proxy_resolution/pac_file_fetcher_impl.cc | 3 +-- net/proxy_resolution/pac_file_fetcher_impl.h | 2 +- net/proxy_resolution/proxy_resolution_service.cc | 8 +++----- net/proxy_resolution/proxy_resolution_service.h | 2 +- net/quic/bidirectional_stream_quic_impl.cc | 3 +-- net/quic/bidirectional_stream_quic_impl.h | 2 +- net/quic/quic_chromium_alarm_factory.cc | 7 +++---- net/quic/quic_chromium_alarm_factory.h | 2 +- net/quic/quic_chromium_client_session.cc | 6 ++---- net/quic/quic_chromium_client_session.h | 4 ++-- net/quic/quic_chromium_client_stream.cc | 9 +++------ net/quic/quic_chromium_client_stream.h | 4 ++-- net/quic/quic_chromium_packet_reader.cc | 3 +-- net/quic/quic_chromium_packet_reader.h | 2 +- net/quic/quic_chromium_packet_writer.cc | 5 ++--- net/quic/quic_chromium_packet_writer.h | 2 +- net/quic/quic_connectivity_probing_manager.cc | 3 +-- net/quic/quic_connectivity_probing_manager.h | 2 +- net/quic/quic_http_stream.cc | 3 +-- net/quic/quic_http_stream.h | 2 +- net/quic/quic_http_stream_test.cc | 4 ++-- net/quic/quic_proxy_client_socket.cc | 3 +-- net/quic/quic_proxy_client_socket.h | 2 +- net/quic/quic_stream_factory.cc | 13 +++++-------- net/quic/quic_stream_factory.h | 2 +- net/reporting/reporting_delivery_agent.cc | 6 ++---- net/server/http_server.cc | 3 +-- net/server/http_server.h | 2 +- net/socket/client_socket_pool_base_unittest.cc | 5 ++--- net/socket/fuzzed_datagram_client_socket.cc | 2 +- net/socket/fuzzed_datagram_client_socket.h | 2 +- net/socket/fuzzed_server_socket.cc | 3 +-- net/socket/fuzzed_server_socket.h | 2 +- net/socket/fuzzed_socket.cc | 3 +-- net/socket/fuzzed_socket.h | 2 +- net/socket/socket_bio_adapter.cc | 3 +-- net/socket/socket_bio_adapter.h | 2 +- net/socket/socket_test_util.cc | 14 +++++--------- net/socket/socket_test_util.h | 10 +++++----- net/socket/ssl_client_socket_impl.cc | 3 +-- net/socket/ssl_client_socket_impl.h | 2 +- net/socket/ssl_server_socket_impl.cc | 5 ++--- net/socket/ssl_server_socket_unittest.cc | 8 ++------ net/socket/tcp_client_socket.cc | 3 +-- net/socket/tcp_client_socket.h | 2 +- net/socket/transport_client_socket_pool.cc | 3 +-- net/socket/transport_client_socket_pool.h | 2 +- .../transport_client_socket_pool_test_util.cc | 5 ++--- net/socket/transport_connect_job.cc | 3 +-- net/socket/transport_connect_job.h | 2 +- net/socket/udp_socket_perftest.cc | 5 ++--- net/socket/udp_socket_posix.cc | 3 +-- net/socket/udp_socket_posix.h | 2 +- net/socket/udp_socket_posix_unittest.cc | 5 ++--- net/socket/websocket_endpoint_lock_manager.cc | 3 +-- net/socket/websocket_endpoint_lock_manager.h | 2 +- .../websocket_transport_client_socket_pool.cc | 3 +-- .../websocket_transport_client_socket_pool.h | 2 +- net/socket/websocket_transport_connect_job.cc | 3 +-- net/socket/websocket_transport_connect_job.h | 2 +- net/spdy/bidirectional_stream_spdy_impl.cc | 3 +-- net/spdy/bidirectional_stream_spdy_impl.h | 2 +- net/spdy/spdy_http_stream.cc | 3 +-- net/spdy/spdy_http_stream.h | 2 +- net/spdy/spdy_http_stream_unittest.cc | 4 ++-- net/spdy/spdy_proxy_client_socket.cc | 4 +--- net/spdy/spdy_proxy_client_socket.h | 5 +++-- net/spdy/spdy_session.cc | 5 ++--- net/spdy/spdy_session.h | 4 ++-- net/spdy/spdy_session_pool.cc | 3 +-- net/spdy/spdy_session_pool.h | 2 +- net/spdy/spdy_stream.cc | 3 +-- net/spdy/spdy_stream.h | 2 +- net/ssl/threaded_ssl_private_key.cc | 3 +-- net/ssl/threaded_ssl_private_key.h | 2 +- .../controllable_http_response.cc | 3 +-- .../controllable_http_response.h | 2 +- .../embedded_test_server/embedded_test_server.cc | 3 +-- .../embedded_test_server/embedded_test_server.h | 2 +- .../embedded_test_server_unittest.cc | 4 ++-- net/test/embedded_test_server/http_connection.cc | 3 +-- net/test/embedded_test_server/http_connection.h | 2 +- net/test/tcp_socket_proxy.cc | 4 ++-- net/test/url_request/ssl_certificate_error_job.cc | 3 +-- net/test/url_request/ssl_certificate_error_job.h | 2 +- net/test/url_request/url_request_failed_job.cc | 3 +-- net/test/url_request/url_request_failed_job.h | 2 +- .../url_request/url_request_hanging_read_job.cc | 4 ++-- .../url_request/url_request_hanging_read_job.h | 2 +- net/test/url_request/url_request_mock_data_job.cc | 3 +-- net/test/url_request/url_request_mock_data_job.h | 2 +- net/test/url_request/url_request_mock_http_job.cc | 3 +-- net/test/url_request/url_request_mock_http_job.h | 2 +- .../url_request/url_request_slow_download_job.cc | 4 +--- .../url_request/url_request_slow_download_job.h | 2 +- net/tools/quic/quic_http_proxy_backend_stream.cc | 3 +-- net/tools/quic/quic_http_proxy_backend_stream.h | 2 +- net/tools/quic/quic_simple_client.cc | 3 +-- net/tools/quic/quic_simple_client.h | 2 +- net/tools/quic/quic_simple_server.cc | 3 +-- net/tools/quic/quic_simple_server.h | 2 +- net/tools/quic/quic_simple_server_packet_writer.cc | 5 +---- net/tools/quic/quic_simple_server_packet_writer.h | 2 +- net/url_request/test_url_fetcher_factory.cc | 3 +-- net/url_request/test_url_fetcher_factory.h | 2 +- net/url_request/url_fetcher_response_writer.cc | 3 +-- net/url_request/url_fetcher_response_writer.h | 2 +- net/url_request/url_request.cc | 3 +-- net/url_request/url_request.h | 2 +- net/url_request/url_request_error_job.cc | 9 ++++----- net/url_request/url_request_error_job.h | 2 +- net/url_request/url_request_file_dir_job.cc | 3 +-- net/url_request/url_request_file_dir_job.h | 2 +- net/url_request/url_request_file_job.cc | 3 +-- net/url_request/url_request_file_job.h | 2 +- net/url_request/url_request_ftp_job.cc | 3 +-- net/url_request/url_request_ftp_job.h | 2 +- net/url_request/url_request_http_job.cc | 3 +-- net/url_request/url_request_http_job.h | 2 +- net/url_request/url_request_job.cc | 4 +--- net/url_request/url_request_job.h | 2 +- .../url_request_job_factory_impl_unittest.cc | 4 ++-- net/url_request/url_request_redirect_job.cc | 3 +-- net/url_request/url_request_redirect_job.h | 2 +- net/url_request/url_request_simple_job.cc | 5 +---- net/url_request/url_request_simple_job.h | 2 +- net/url_request/url_request_test_job.cc | 6 ++---- net/url_request/url_request_test_job.h | 2 +- net/url_request/url_request_unittest.cc | 5 ++--- net/websockets/websocket_basic_handshake_stream.cc | 3 +-- net/websockets/websocket_basic_handshake_stream.h | 2 +- net/websockets/websocket_basic_stream_adapters.cc | 3 +-- net/websockets/websocket_basic_stream_adapters.h | 2 +- net/websockets/websocket_channel_test.cc | 4 ++-- net/websockets/websocket_http2_handshake_stream.cc | 3 +-- net/websockets/websocket_http2_handshake_stream.h | 2 +- 215 files changed, 290 insertions(+), 429 deletions(-) diff --git a/net/base/chunked_upload_data_stream.cc b/net/base/chunked_upload_data_stream.cc index f7e2a66f4735aa..f4db7d73a601c3 100644 --- a/net/base/chunked_upload_data_stream.cc +++ b/net/base/chunked_upload_data_stream.cc @@ -31,8 +31,7 @@ ChunkedUploadDataStream::ChunkedUploadDataStream(int64_t identifier) read_index_(0), read_offset_(0), all_data_appended_(false), - read_buffer_len_(0), - weak_factory_(this) {} + read_buffer_len_(0) {} ChunkedUploadDataStream::~ChunkedUploadDataStream() = default; diff --git a/net/base/chunked_upload_data_stream.h b/net/base/chunked_upload_data_stream.h index 65da00deae0efa..50f644f94bffa8 100644 --- a/net/base/chunked_upload_data_stream.h +++ b/net/base/chunked_upload_data_stream.h @@ -98,7 +98,7 @@ class NET_EXPORT ChunkedUploadDataStream : public UploadDataStream { scoped_refptr read_buffer_; int read_buffer_len_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(ChunkedUploadDataStream); }; diff --git a/net/base/elements_upload_data_stream.cc b/net/base/elements_upload_data_stream.cc index 9465b746162491..5cc6590811fd39 100644 --- a/net/base/elements_upload_data_stream.cc +++ b/net/base/elements_upload_data_stream.cc @@ -19,8 +19,7 @@ ElementsUploadDataStream::ElementsUploadDataStream( : UploadDataStream(false, identifier), element_readers_(std::move(element_readers)), element_index_(0), - read_error_(OK), - weak_ptr_factory_(this) {} + read_error_(OK) {} ElementsUploadDataStream::~ElementsUploadDataStream() = default; diff --git a/net/base/elements_upload_data_stream.h b/net/base/elements_upload_data_stream.h index 4ad404897fe64f..ba8f9457e7c642 100644 --- a/net/base/elements_upload_data_stream.h +++ b/net/base/elements_upload_data_stream.h @@ -80,7 +80,7 @@ class NET_EXPORT ElementsUploadDataStream : public UploadDataStream { // Set to actual error if read fails, otherwise set to net::OK. int read_error_; - base::WeakPtrFactory weak_ptr_factory_; + base::WeakPtrFactory weak_ptr_factory_{this}; DISALLOW_COPY_AND_ASSIGN(ElementsUploadDataStream); }; diff --git a/net/base/mock_file_stream.cc b/net/base/mock_file_stream.cc index 4cff945228ce45..64104ee200bacf 100644 --- a/net/base/mock_file_stream.cc +++ b/net/base/mock_file_stream.cc @@ -20,9 +20,7 @@ MockFileStream::MockFileStream( : FileStream(task_runner), forced_error_(OK), async_error_(false), - throttled_(false), - weak_factory_(this) { -} + throttled_(false) {} MockFileStream::MockFileStream( base::File file, @@ -30,8 +28,7 @@ MockFileStream::MockFileStream( : FileStream(std::move(file), task_runner), forced_error_(OK), async_error_(false), - throttled_(false), - weak_factory_(this) {} + throttled_(false) {} MockFileStream::~MockFileStream() = default; diff --git a/net/base/mock_file_stream.h b/net/base/mock_file_stream.h index 9f1eb98b94afa1..fba7843256c588 100644 --- a/net/base/mock_file_stream.h +++ b/net/base/mock_file_stream.h @@ -98,7 +98,7 @@ class MockFileStream : public FileStream { base::OnceClosure throttled_task_; base::FilePath path_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; }; } // namespace testing diff --git a/net/base/upload_file_element_reader.cc b/net/base/upload_file_element_reader.cc index adf4e74551c5e6..b393600077a355 100644 --- a/net/base/upload_file_element_reader.cc +++ b/net/base/upload_file_element_reader.cc @@ -38,8 +38,7 @@ UploadFileElementReader::UploadFileElementReader( content_length_(0), bytes_remaining_(0), next_state_(State::IDLE), - init_called_while_operation_pending_(false), - weak_ptr_factory_(this) { + init_called_while_operation_pending_(false) { DCHECK(file.IsValid()); DCHECK(task_runner_.get()); file_stream_ = std::make_unique(std::move(file), task_runner); @@ -59,8 +58,7 @@ UploadFileElementReader::UploadFileElementReader( content_length_(0), bytes_remaining_(0), next_state_(State::IDLE), - init_called_while_operation_pending_(false), - weak_ptr_factory_(this) { + init_called_while_operation_pending_(false) { DCHECK(task_runner_.get()); } diff --git a/net/base/upload_file_element_reader.h b/net/base/upload_file_element_reader.h index 190bbc4b8f17d6..706137af85ed1d 100644 --- a/net/base/upload_file_element_reader.h +++ b/net/base/upload_file_element_reader.h @@ -129,7 +129,7 @@ class NET_EXPORT UploadFileElementReader : public UploadElementReader { // True if Init() was called while an async operation was in progress. bool init_called_while_operation_pending_; - base::WeakPtrFactory weak_ptr_factory_; + base::WeakPtrFactory weak_ptr_factory_{this}; DISALLOW_COPY_AND_ASSIGN(UploadFileElementReader); }; diff --git a/net/cert/mock_cert_verifier.cc b/net/cert/mock_cert_verifier.cc index 3a5161ff64baaa..e65dadb7e7f9e9 100644 --- a/net/cert/mock_cert_verifier.cc +++ b/net/cert/mock_cert_verifier.cc @@ -43,7 +43,7 @@ struct MockCertVerifier::Rule { class MockCertVerifier::MockRequest : public CertVerifier::Request { public: MockRequest(CertVerifyResult* result, CompletionOnceCallback callback) - : result_(result), callback_(std::move(callback)), weak_factory_(this) {} + : result_(result), callback_(std::move(callback)) {} void ReturnResultLater(int rv, const CertVerifyResult& result) { base::ThreadTaskRunnerHandle::Get()->PostTask( @@ -59,7 +59,7 @@ class MockCertVerifier::MockRequest : public CertVerifier::Request { CertVerifyResult* result_; CompletionOnceCallback callback_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; }; MockCertVerifier::MockCertVerifier() diff --git a/net/cert/multi_threaded_cert_verifier.cc b/net/cert/multi_threaded_cert_verifier.cc index 531aa0e9cbbb59..e2c60131282e1a 100644 --- a/net/cert/multi_threaded_cert_verifier.cc +++ b/net/cert/multi_threaded_cert_verifier.cc @@ -221,8 +221,7 @@ class CertVerifierJob { net_log_(NetLogWithSource::Make(net_log, NetLogSourceType::CERT_VERIFIER_JOB)), cert_verifier_(cert_verifier), - is_first_job_(false), - weak_ptr_factory_(this) { + is_first_job_(false) { net_log_.BeginEvent(NetLogEventType::CERT_VERIFIER_JOB, base::Bind(&NetLogX509CertificateCallback, base::Unretained(key.certificate().get()))); @@ -345,7 +344,7 @@ class CertVerifierJob { MultiThreadedCertVerifier* cert_verifier_; // Non-owned. bool is_first_job_; - base::WeakPtrFactory weak_ptr_factory_; + base::WeakPtrFactory weak_ptr_factory_{this}; }; MultiThreadedCertVerifier::MultiThreadedCertVerifier( diff --git a/net/cert/nss_cert_database.cc b/net/cert/nss_cert_database.cc index bc966fbe0d6e4f..56dd1272052c1c 100644 --- a/net/cert/nss_cert_database.cc +++ b/net/cert/nss_cert_database.cc @@ -70,8 +70,7 @@ NSSCertDatabase::NSSCertDatabase(crypto::ScopedPK11Slot public_slot, crypto::ScopedPK11Slot private_slot) : public_slot_(std::move(public_slot)), private_slot_(std::move(private_slot)), - observer_list_(new base::ObserverListThreadSafe), - weak_factory_(this) { + observer_list_(new base::ObserverListThreadSafe) { CHECK(public_slot_); CertDatabase* cert_db = CertDatabase::GetInstance(); diff --git a/net/cert/nss_cert_database.h b/net/cert/nss_cert_database.h index cee2f01b492f0f..97be8c45eb3345 100644 --- a/net/cert/nss_cert_database.h +++ b/net/cert/nss_cert_database.h @@ -282,7 +282,7 @@ class NET_EXPORT NSSCertDatabase { const scoped_refptr> observer_list_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(NSSCertDatabase); }; diff --git a/net/cookies/cookie_monster.cc b/net/cookies/cookie_monster.cc index a13fb0f04340ad..909d5aad07ad65 100644 --- a/net/cookies/cookie_monster.cc +++ b/net/cookies/cookie_monster.cc @@ -355,8 +355,7 @@ CookieMonster::CookieMonster(scoped_refptr store, store_(std::move(store)), last_access_threshold_(last_access_threshold), last_statistic_record_time_(base::Time::Now()), - persist_session_cookies_(false), - weak_ptr_factory_(this) { + persist_session_cookies_(false) { InitializeHistograms(); cookieable_schemes_.insert( cookieable_schemes_.begin(), kDefaultCookieableSchemes, diff --git a/net/cookies/cookie_monster.h b/net/cookies/cookie_monster.h index 85ca69f491ac43..913737e78194ec 100644 --- a/net/cookies/cookie_monster.h +++ b/net/cookies/cookie_monster.h @@ -623,7 +623,7 @@ class NET_EXPORT CookieMonster : public CookieStore { base::ThreadChecker thread_checker_; - base::WeakPtrFactory weak_ptr_factory_; + base::WeakPtrFactory weak_ptr_factory_{this}; DISALLOW_COPY_AND_ASSIGN(CookieMonster); }; diff --git a/net/cookies/cookie_monster_change_dispatcher.cc b/net/cookies/cookie_monster_change_dispatcher.cc index 39ccf3b25f45e0..7d09ea4bae0c01 100644 --- a/net/cookies/cookie_monster_change_dispatcher.cc +++ b/net/cookies/cookie_monster_change_dispatcher.cc @@ -35,8 +35,7 @@ CookieMonsterChangeDispatcher::Subscription::Subscription( name_key_(std::move(name_key)), url_(std::move(url)), callback_(std::move(callback)), - task_runner_(base::ThreadTaskRunnerHandle::Get()), - weak_ptr_factory_(this) { + task_runner_(base::ThreadTaskRunnerHandle::Get()) { DCHECK(url_.is_valid() || url_.is_empty()); DCHECK_EQ(url_.is_empty(), domain_key_ == kGlobalDomainKey); @@ -80,8 +79,7 @@ void CookieMonsterChangeDispatcher::Subscription::DoDispatchChange( callback_.Run(cookie, change_cause); } -CookieMonsterChangeDispatcher::CookieMonsterChangeDispatcher() - : weak_ptr_factory_(this) {} +CookieMonsterChangeDispatcher::CookieMonsterChangeDispatcher() {} CookieMonsterChangeDispatcher::~CookieMonsterChangeDispatcher() { DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); diff --git a/net/cookies/cookie_monster_change_dispatcher.h b/net/cookies/cookie_monster_change_dispatcher.h index caf35e8d91ee50..b1d7c51fadbf27 100644 --- a/net/cookies/cookie_monster_change_dispatcher.h +++ b/net/cookies/cookie_monster_change_dispatcher.h @@ -105,7 +105,7 @@ class CookieMonsterChangeDispatcher : public CookieChangeDispatcher { // Used to cancel delayed calls to DoDispatchChange() when the subscription // gets destroyed. - base::WeakPtrFactory weak_ptr_factory_; + base::WeakPtrFactory weak_ptr_factory_{this}; DISALLOW_COPY_AND_ASSIGN(Subscription); }; @@ -149,7 +149,7 @@ class CookieMonsterChangeDispatcher : public CookieChangeDispatcher { THREAD_CHECKER(thread_checker_); // Vends weak pointers to subscriptions. - base::WeakPtrFactory weak_ptr_factory_; + base::WeakPtrFactory weak_ptr_factory_{this}; DISALLOW_COPY_AND_ASSIGN(CookieMonsterChangeDispatcher); }; diff --git a/net/disk_cache/blockfile/backend_impl.cc b/net/disk_cache/blockfile/backend_impl.cc index 8787a2389b80bf..b231b7caa42a63 100644 --- a/net/disk_cache/blockfile/backend_impl.cc +++ b/net/disk_cache/blockfile/backend_impl.cc @@ -173,8 +173,7 @@ BackendImpl::BackendImpl( consider_evicting_at_op_end_(false), net_log_(net_log), done_(base::WaitableEvent::ResetPolicy::MANUAL, - base::WaitableEvent::InitialState::NOT_SIGNALED), - ptr_factory_(this) {} + base::WaitableEvent::InitialState::NOT_SIGNALED) {} BackendImpl::BackendImpl( const base::FilePath& path, @@ -202,8 +201,7 @@ BackendImpl::BackendImpl( consider_evicting_at_op_end_(false), net_log_(net_log), done_(base::WaitableEvent::ResetPolicy::MANUAL, - base::WaitableEvent::InitialState::NOT_SIGNALED), - ptr_factory_(this) {} + base::WaitableEvent::InitialState::NOT_SIGNALED) {} BackendImpl::~BackendImpl() { if (user_flags_ & kNoRandom) { diff --git a/net/disk_cache/blockfile/backend_impl.h b/net/disk_cache/blockfile/backend_impl.h index 99d28d7b966cbd..16a492ba739842 100644 --- a/net/disk_cache/blockfile/backend_impl.h +++ b/net/disk_cache/blockfile/backend_impl.h @@ -430,7 +430,7 @@ class NET_EXPORT_PRIVATE BackendImpl : public Backend { std::unique_ptr timer_; // Usage timer. base::WaitableEvent done_; // Signals the end of background work. scoped_refptr trace_object_; // Initializes internal tracing. - base::WeakPtrFactory ptr_factory_; + base::WeakPtrFactory ptr_factory_{this}; DISALLOW_COPY_AND_ASSIGN(BackendImpl); }; diff --git a/net/disk_cache/blockfile/eviction.cc b/net/disk_cache/blockfile/eviction.cc index 2608c7a1b4fc27..489f5494f10c8b 100644 --- a/net/disk_cache/blockfile/eviction.cc +++ b/net/disk_cache/blockfile/eviction.cc @@ -79,7 +79,7 @@ namespace disk_cache { // The real initialization happens during Init(), init_ is the only member that // has to be initialized here. -Eviction::Eviction() : backend_(nullptr), init_(false), ptr_factory_(this) {} +Eviction::Eviction() : backend_(nullptr), init_(false) {} Eviction::~Eviction() = default; diff --git a/net/disk_cache/blockfile/eviction.h b/net/disk_cache/blockfile/eviction.h index baea659e24768c..283463f5808e45 100644 --- a/net/disk_cache/blockfile/eviction.h +++ b/net/disk_cache/blockfile/eviction.h @@ -81,7 +81,7 @@ class Eviction { bool delay_trim_; bool init_; bool test_mode_; - base::WeakPtrFactory ptr_factory_; + base::WeakPtrFactory ptr_factory_{this}; DISALLOW_COPY_AND_ASSIGN(Eviction); }; diff --git a/net/disk_cache/blockfile/in_flight_backend_io.cc b/net/disk_cache/blockfile/in_flight_backend_io.cc index 32895a590475d1..c4922955b4287b 100644 --- a/net/disk_cache/blockfile/in_flight_backend_io.cc +++ b/net/disk_cache/blockfile/in_flight_backend_io.cc @@ -396,10 +396,7 @@ void BackendIO::ExecuteEntryOperation() { InFlightBackendIO::InFlightBackendIO( BackendImpl* backend, const scoped_refptr& background_thread) - : backend_(backend), - background_thread_(background_thread), - ptr_factory_(this) { -} + : backend_(backend), background_thread_(background_thread) {} InFlightBackendIO::~InFlightBackendIO() = default; diff --git a/net/disk_cache/blockfile/in_flight_backend_io.h b/net/disk_cache/blockfile/in_flight_backend_io.h index 7d0502192fe400..724cc338323cfc 100644 --- a/net/disk_cache/blockfile/in_flight_backend_io.h +++ b/net/disk_cache/blockfile/in_flight_backend_io.h @@ -251,7 +251,7 @@ class InFlightBackendIO : public InFlightIO { void PostOperation(const base::Location& from_here, BackendIO* operation); BackendImpl* backend_; scoped_refptr background_thread_; - base::WeakPtrFactory ptr_factory_; + base::WeakPtrFactory ptr_factory_{this}; DISALLOW_COPY_AND_ASSIGN(InFlightBackendIO); }; diff --git a/net/disk_cache/memory/mem_backend_impl.cc b/net/disk_cache/memory/mem_backend_impl.cc index a03c53d1321c3f..bddd885827e2be 100644 --- a/net/disk_cache/memory/mem_backend_impl.cc +++ b/net/disk_cache/memory/mem_backend_impl.cc @@ -63,8 +63,7 @@ MemBackendImpl::MemBackendImpl(net::NetLog* net_log) net_log_(net_log), memory_pressure_listener_( base::BindRepeating(&MemBackendImpl::OnMemoryPressure, - base::Unretained(this))), - weak_factory_(this) {} + base::Unretained(this))) {} MemBackendImpl::~MemBackendImpl() { DCHECK(CheckLRUListOrder(lru_list_)); diff --git a/net/disk_cache/memory/mem_backend_impl.h b/net/disk_cache/memory/mem_backend_impl.h index f79ef33207a5f2..046fed2a222cf6 100644 --- a/net/disk_cache/memory/mem_backend_impl.h +++ b/net/disk_cache/memory/mem_backend_impl.h @@ -149,7 +149,7 @@ class NET_EXPORT_PRIVATE MemBackendImpl final : public Backend { base::MemoryPressureListener memory_pressure_listener_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(MemBackendImpl); }; diff --git a/net/disk_cache/simple/simple_backend_impl.cc b/net/disk_cache/simple/simple_backend_impl.cc index 1b3a4fe8d8c559..018d6ae4d968ab 100644 --- a/net/disk_cache/simple/simple_backend_impl.cc +++ b/net/disk_cache/simple/simple_backend_impl.cc @@ -558,9 +558,7 @@ int64_t SimpleBackendImpl::CalculateSizeOfEntriesBetween( class SimpleBackendImpl::SimpleIterator final : public Iterator { public: explicit SimpleIterator(base::WeakPtr backend) - : backend_(backend), - weak_factory_(this) { - } + : backend_(backend) {} // From Backend::Iterator: net::Error OpenNextEntry(Entry** next_entry, @@ -624,7 +622,7 @@ class SimpleBackendImpl::SimpleIterator final : public Iterator { private: base::WeakPtr backend_; std::unique_ptr> hashes_to_enumerate_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; }; std::unique_ptr SimpleBackendImpl::CreateIterator() { diff --git a/net/dns/dns_config_service_posix.cc b/net/dns/dns_config_service_posix.cc index 21852feee1ae25..328cdd8c55977c 100644 --- a/net/dns/dns_config_service_posix.cc +++ b/net/dns/dns_config_service_posix.cc @@ -239,8 +239,7 @@ ConfigParsePosixResult ReadDnsConfig(DnsConfig* dns_config) { class DnsConfigServicePosix::Watcher { public: - explicit Watcher(DnsConfigServicePosix* service) - : service_(service), weak_factory_(this) {} + explicit Watcher(DnsConfigServicePosix* service) : service_(service) {} ~Watcher() = default; bool Watch() { @@ -294,7 +293,7 @@ class DnsConfigServicePosix::Watcher { base::FilePathWatcher hosts_watcher_; #endif // !defined(OS_ANDROID) && !defined(OS_IOS) - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(Watcher); }; diff --git a/net/dns/dns_socket_pool_unittest.cc b/net/dns/dns_socket_pool_unittest.cc index eba974942674f7..2138518e5a1b9b 100644 --- a/net/dns/dns_socket_pool_unittest.cc +++ b/net/dns/dns_socket_pool_unittest.cc @@ -16,14 +16,14 @@ namespace { class DummyObject { public: - DummyObject() : weak_factory_(this) {} + DummyObject() {} base::WeakPtr GetWeakPtr() { return weak_factory_.GetWeakPtr(); } bool HasWeakPtrs() const { return weak_factory_.HasWeakPtrs(); } private: - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(DummyObject); }; diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc index 8bced98736b6e8..4623473110dfaf 100644 --- a/net/dns/dns_transaction.cc +++ b/net/dns/dns_transaction.cc @@ -329,9 +329,7 @@ class DnsHTTPAttempt : public DnsAttempt, public URLRequest::Delegate { bool use_post, URLRequestContext* url_request_context, RequestPriority request_priority_) - : DnsAttempt(server_index), - query_(std::move(query)), - weak_factory_(this) { + : DnsAttempt(server_index), query_(std::move(query)) { GURL url; if (use_post) { // Set url for a POST request @@ -531,7 +529,7 @@ class DnsHTTPAttempt : public DnsAttempt, public URLRequest::Delegate { std::unique_ptr request_; NetLogWithSource net_log_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(DnsHTTPAttempt); }; diff --git a/net/dns/dns_transaction_unittest.cc b/net/dns/dns_transaction_unittest.cc index 7c01c64581e805..ec5f56e607924c 100644 --- a/net/dns/dns_transaction_unittest.cc +++ b/net/dns/dns_transaction_unittest.cc @@ -418,8 +418,7 @@ class URLRequestMockDohJob : public URLRequestJob, public AsyncSocket { content_length_(0), leftover_data_len_(0), data_provider_(data_provider), - response_modifier_(response_modifier), - weak_factory_(this) { + response_modifier_(response_modifier) { data_provider_->Initialize(this); MatchQueryData(request, data_provider); } @@ -559,7 +558,7 @@ class URLRequestMockDohJob : public URLRequestJob, public AsyncSocket { IOBuffer* pending_buf_; int pending_buf_size_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(URLRequestMockDohJob); }; diff --git a/net/dns/fuzzed_host_resolver_util.cc b/net/dns/fuzzed_host_resolver_util.cc index b547c5a11676f8..c384abf4eadaf0 100644 --- a/net/dns/fuzzed_host_resolver_util.cc +++ b/net/dns/fuzzed_host_resolver_util.cc @@ -174,8 +174,7 @@ class FuzzedMdnsSocket : public DatagramServerSocket { public: explicit FuzzedMdnsSocket(FuzzedDataProvider* data_provider) : data_provider_(data_provider), - local_address_(FuzzIPAddress(data_provider_), 5353), - weak_factory_(this) {} + local_address_(FuzzIPAddress(data_provider_), 5353) {} int Listen(const IPEndPoint& address) override { return OK; } @@ -281,7 +280,7 @@ class FuzzedMdnsSocket : public DatagramServerSocket { const IPEndPoint local_address_; const NetLogWithSource net_log_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; }; class FuzzedMdnsSocketFactory : public MDnsSocketFactory { diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc index fc932a233e01ea..a9bc7ef72bfcb6 100644 --- a/net/dns/host_resolver_manager.cc +++ b/net/dns/host_resolver_manager.cc @@ -807,8 +807,7 @@ class HostResolverManager::ProcTask { proc_task_runner_(std::move(proc_task_runner)), attempt_number_(0), net_log_(job_net_log), - tick_clock_(tick_clock), - weak_ptr_factory_(this) { + tick_clock_(tick_clock) { DCHECK(callback_); if (!params_.resolver_proc.get()) params_.resolver_proc = HostResolverProc::GetDefault(); @@ -991,7 +990,7 @@ class HostResolverManager::ProcTask { // Used to loop back from the blocking lookup attempt tasks as well as from // delayed retry tasks. Invalidate WeakPtrs on completion and cancellation to // cancel handling of such posted tasks. - base::WeakPtrFactory weak_ptr_factory_; + base::WeakPtrFactory weak_ptr_factory_{this}; DISALLOW_COPY_AND_ASSIGN(ProcTask); }; @@ -1522,8 +1521,7 @@ class HostResolverManager::Job : public PrioritizedDispatcher::Job, tick_clock_(tick_clock), net_log_( NetLogWithSource::Make(source_net_log.net_log(), - NetLogSourceType::HOST_RESOLVER_IMPL_JOB)), - weak_ptr_factory_(this) { + NetLogSourceType::HOST_RESOLVER_IMPL_JOB)) { source_net_log.AddEvent(NetLogEventType::HOST_RESOLVER_IMPL_CREATE_JOB); net_log_.BeginEvent(NetLogEventType::HOST_RESOLVER_IMPL_JOB, @@ -2348,7 +2346,7 @@ class HostResolverManager::Job : public PrioritizedDispatcher::Job, // Iterator to |this| in the JobMap. |nullopt| if not owned by the JobMap. base::Optional self_iterator_; - base::WeakPtrFactory weak_ptr_factory_; + base::WeakPtrFactory weak_ptr_factory_{this}; }; //----------------------------------------------------------------------------- @@ -2372,9 +2370,7 @@ HostResolverManager::HostResolverManager( use_proctask_by_default_(false), allow_fallback_to_proctask_(true), tick_clock_(base::DefaultTickClock::GetInstance()), - invalidation_in_progress_(false), - weak_ptr_factory_(this), - probe_weak_ptr_factory_(this) { + invalidation_in_progress_(false) { PrioritizedDispatcher::Limits job_limits = GetDispatcherLimits(options); dispatcher_.reset(new PrioritizedDispatcher(job_limits)); max_queued_jobs_ = job_limits.total_jobs * 100u; diff --git a/net/dns/host_resolver_manager.h b/net/dns/host_resolver_manager.h index 428fead1e777ce..8f9044912bde34 100644 --- a/net/dns/host_resolver_manager.h +++ b/net/dns/host_resolver_manager.h @@ -534,9 +534,9 @@ class NET_EXPORT HostResolverManager THREAD_CHECKER(thread_checker_); - base::WeakPtrFactory weak_ptr_factory_; + base::WeakPtrFactory weak_ptr_factory_{this}; - base::WeakPtrFactory probe_weak_ptr_factory_; + base::WeakPtrFactory probe_weak_ptr_factory_{this}; DISALLOW_COPY_AND_ASSIGN(HostResolverManager); }; diff --git a/net/dns/host_resolver_mdns_task.cc b/net/dns/host_resolver_mdns_task.cc index cc5c3647101ffc..356278b5721c96 100644 --- a/net/dns/host_resolver_mdns_task.cc +++ b/net/dns/host_resolver_mdns_task.cc @@ -128,7 +128,7 @@ HostResolverMdnsTask::HostResolverMdnsTask( MDnsClient* mdns_client, const std::string& hostname, const std::vector& query_types) - : mdns_client_(mdns_client), hostname_(hostname), weak_ptr_factory_(this) { + : mdns_client_(mdns_client), hostname_(hostname) { DCHECK(!query_types.empty()); for (DnsQueryType query_type : query_types) { transactions_.emplace_back(query_type, this); diff --git a/net/dns/host_resolver_mdns_task.h b/net/dns/host_resolver_mdns_task.h index 5a1c829417601a..e0e408afdf0fad 100644 --- a/net/dns/host_resolver_mdns_task.h +++ b/net/dns/host_resolver_mdns_task.h @@ -63,7 +63,7 @@ class HostResolverMdnsTask { SEQUENCE_CHECKER(sequence_checker_); - base::WeakPtrFactory weak_ptr_factory_; + base::WeakPtrFactory weak_ptr_factory_{this}; DISALLOW_COPY_AND_ASSIGN(HostResolverMdnsTask); }; diff --git a/net/dns/mdns_client_impl.cc b/net/dns/mdns_client_impl.cc index 4d3ce6c53f2973..9ac0592fdcf503 100644 --- a/net/dns/mdns_client_impl.cc +++ b/net/dns/mdns_client_impl.cc @@ -131,8 +131,7 @@ void MDnsConnection::SocketHandler::SendDone(int rv) { } MDnsConnection::MDnsConnection(MDnsConnection::Delegate* delegate) - : delegate_(delegate), weak_ptr_factory_(this) { -} + : delegate_(delegate) {} MDnsConnection::~MDnsConnection() = default; diff --git a/net/dns/mdns_client_impl.h b/net/dns/mdns_client_impl.h index fd911dcd12f6e3..0efda0b9a4257a 100644 --- a/net/dns/mdns_client_impl.h +++ b/net/dns/mdns_client_impl.h @@ -111,7 +111,7 @@ class NET_EXPORT_PRIVATE MDnsConnection { Delegate* delegate_; - base::WeakPtrFactory weak_ptr_factory_; + base::WeakPtrFactory weak_ptr_factory_{this}; DISALLOW_COPY_AND_ASSIGN(MDnsConnection); }; diff --git a/net/dns/serial_worker.cc b/net/dns/serial_worker.cc index 520bd3a64b99bd..f66abb17207c07 100644 --- a/net/dns/serial_worker.cc +++ b/net/dns/serial_worker.cc @@ -15,8 +15,7 @@ namespace net { SerialWorker::SerialWorker() : base::RefCountedDeleteOnSequence( base::SequencedTaskRunnerHandle::Get()), - state_(IDLE), - weak_factory_(this) {} + state_(IDLE) {} SerialWorker::~SerialWorker() = default; diff --git a/net/dns/serial_worker.h b/net/dns/serial_worker.h index b647b69e599f82..a16e846129171a 100644 --- a/net/dns/serial_worker.h +++ b/net/dns/serial_worker.h @@ -76,7 +76,7 @@ class NET_EXPORT_PRIVATE SerialWorker State state_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(SerialWorker); }; diff --git a/net/dns/system_dns_config_change_notifier.cc b/net/dns/system_dns_config_change_notifier.cc index a75e24c321152c..a865243a16a868 100644 --- a/net/dns/system_dns_config_change_notifier.cc +++ b/net/dns/system_dns_config_change_notifier.cc @@ -29,8 +29,7 @@ class WrappedObserver { public: explicit WrappedObserver(SystemDnsConfigChangeNotifier::Observer* observer) : task_runner_(base::SequencedTaskRunnerHandle::Get()), - observer_(observer), - weak_ptr_factory_(this) {} + observer_(observer) {} ~WrappedObserver() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); } @@ -53,7 +52,7 @@ class WrappedObserver { SystemDnsConfigChangeNotifier::Observer* const observer_; SEQUENCE_CHECKER(sequence_checker_); - base::WeakPtrFactory weak_ptr_factory_; + base::WeakPtrFactory weak_ptr_factory_{this}; DISALLOW_COPY_AND_ASSIGN(WrappedObserver); }; @@ -67,8 +66,7 @@ class SystemDnsConfigChangeNotifier::Core { Core(scoped_refptr task_runner, std::unique_ptr dns_config_service) : task_runner_(std::move(task_runner)), - dns_config_service_(std::move(dns_config_service)), - weak_ptr_factory_(this) { + dns_config_service_(std::move(dns_config_service)) { DCHECK(task_runner_); DCHECK(dns_config_service_); @@ -170,7 +168,7 @@ class SystemDnsConfigChangeNotifier::Core { scoped_refptr task_runner_; SEQUENCE_CHECKER(sequence_checker_); std::unique_ptr dns_config_service_; - base::WeakPtrFactory weak_ptr_factory_; + base::WeakPtrFactory weak_ptr_factory_{this}; DISALLOW_COPY_AND_ASSIGN(Core); }; diff --git a/net/extras/sqlite/sqlite_persistent_reporting_and_nel_store.cc b/net/extras/sqlite/sqlite_persistent_reporting_and_nel_store.cc index e0f6f156831bb7..f67e487ca501dd 100644 --- a/net/extras/sqlite/sqlite_persistent_reporting_and_nel_store.cc +++ b/net/extras/sqlite/sqlite_persistent_reporting_and_nel_store.cc @@ -1257,8 +1257,7 @@ SQLitePersistentReportingAndNelStore::SQLitePersistentReportingAndNelStore( const base::FilePath& path, const scoped_refptr& client_task_runner, const scoped_refptr& background_task_runner) - : backend_(new Backend(path, client_task_runner, background_task_runner)), - weak_factory_(this) {} + : backend_(new Backend(path, client_task_runner, background_task_runner)) {} SQLitePersistentReportingAndNelStore::~SQLitePersistentReportingAndNelStore() { backend_->Close(); diff --git a/net/extras/sqlite/sqlite_persistent_reporting_and_nel_store.h b/net/extras/sqlite/sqlite_persistent_reporting_and_nel_store.h index 1a6a7fb25c654c..cbd8646ce8bc6b 100644 --- a/net/extras/sqlite/sqlite_persistent_reporting_and_nel_store.h +++ b/net/extras/sqlite/sqlite_persistent_reporting_and_nel_store.h @@ -77,7 +77,8 @@ class COMPONENT_EXPORT(NET_EXTRAS) SQLitePersistentReportingAndNelStore const scoped_refptr backend_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{ + this}; DISALLOW_COPY_AND_ASSIGN(SQLitePersistentReportingAndNelStore); }; diff --git a/net/http/bidirectional_stream.cc b/net/http/bidirectional_stream.cc index 780b8e4d01d478..0e238451622a9c 100644 --- a/net/http/bidirectional_stream.cc +++ b/net/http/bidirectional_stream.cc @@ -86,8 +86,7 @@ BidirectionalStream::BidirectionalStream( send_request_headers_automatically_(send_request_headers_automatically), request_headers_sent_(false), delegate_(delegate), - timer_(std::move(timer)), - weak_factory_(this) { + timer_(std::move(timer)) { DCHECK(delegate_); DCHECK(request_info_); diff --git a/net/http/bidirectional_stream.h b/net/http/bidirectional_stream.h index d4f56f4b14ec52..4f0b4ab4ff6ba0 100644 --- a/net/http/bidirectional_stream.h +++ b/net/http/bidirectional_stream.h @@ -263,7 +263,7 @@ class NET_EXPORT BidirectionalStream : public BidirectionalStreamImpl::Delegate, // are received. Other fields are populated at different stages of the request LoadTimingInfo load_timing_info_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(BidirectionalStream); }; diff --git a/net/http/broken_alternative_services.cc b/net/http/broken_alternative_services.cc index e2a71855b03622..fcb9548f9f79fa 100644 --- a/net/http/broken_alternative_services.cc +++ b/net/http/broken_alternative_services.cc @@ -34,7 +34,7 @@ base::TimeDelta ComputeBrokenAlternativeServiceExpirationDelay( BrokenAlternativeServices::BrokenAlternativeServices( Delegate* delegate, const base::TickClock* clock) - : delegate_(delegate), clock_(clock), weak_ptr_factory_(this) { + : delegate_(delegate), clock_(clock) { DCHECK(delegate_); DCHECK(clock_); } diff --git a/net/http/broken_alternative_services.h b/net/http/broken_alternative_services.h index 3d6690f2162f82..2d93fb4901a8ce 100644 --- a/net/http/broken_alternative_services.h +++ b/net/http/broken_alternative_services.h @@ -165,7 +165,7 @@ class NET_EXPORT_PRIVATE BrokenAlternativeServices { // services. base::OneShotTimer expiration_timer_; - base::WeakPtrFactory weak_ptr_factory_; + base::WeakPtrFactory weak_ptr_factory_{this}; }; } // namespace net diff --git a/net/http/http_auth_handler_mock.cc b/net/http/http_auth_handler_mock.cc index 74d9fefcb1341f..2f051cedddf16f 100644 --- a/net/http/http_auth_handler_mock.cc +++ b/net/http/http_auth_handler_mock.cc @@ -49,8 +49,7 @@ HttpAuthHandlerMock::HttpAuthHandlerMock() first_round_(true), connection_based_(false), allows_default_credentials_(false), - allows_explicit_credentials_(true), - weak_factory_(this) {} + allows_explicit_credentials_(true) {} HttpAuthHandlerMock::~HttpAuthHandlerMock() = default; diff --git a/net/http/http_auth_handler_mock.h b/net/http/http_auth_handler_mock.h index abc36936dec778..5e7e32c82f1ec0 100644 --- a/net/http/http_auth_handler_mock.h +++ b/net/http/http_auth_handler_mock.h @@ -111,7 +111,7 @@ class HttpAuthHandlerMock : public HttpAuthHandler { bool allows_default_credentials_; bool allows_explicit_credentials_; GURL request_url_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; }; void PrintTo(const HttpAuthHandlerMock::State& state, ::std::ostream* os); diff --git a/net/http/http_cache.cc b/net/http/http_cache.cc index acd5cf812b0306..dfea258f7bcdb0 100644 --- a/net/http/http_cache.cc +++ b/net/http/http_cache.cc @@ -250,8 +250,7 @@ HttpCache::HttpCache(std::unique_ptr network_layer, fail_conditionalization_for_test_(false), mode_(NORMAL), network_layer_(std::move(network_layer)), - clock_(base::DefaultClock::GetInstance()), - weak_factory_(this) { + clock_(base::DefaultClock::GetInstance()) { HttpNetworkSession* session = network_layer_->GetSession(); // Session may be NULL in unittests. // TODO(mmenke): Seems like tests could be changed to provide a session, diff --git a/net/http/http_cache.h b/net/http/http_cache.h index 832a5dcc4ebbe4..c6422af4543678 100644 --- a/net/http/http_cache.h +++ b/net/http/http_cache.h @@ -663,7 +663,7 @@ class NET_EXPORT HttpCache : public HttpTransactionFactory { THREAD_CHECKER(thread_checker_); - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(HttpCache); }; diff --git a/net/http/http_cache_lookup_manager.cc b/net/http/http_cache_lookup_manager.cc index db6240bc1f997a..770552b3b3ebb8 100644 --- a/net/http/http_cache_lookup_manager.cc +++ b/net/http/http_cache_lookup_manager.cc @@ -61,7 +61,7 @@ void HttpCacheLookupManager::LookupTransaction::OnLookupComplete(int result) { } HttpCacheLookupManager::HttpCacheLookupManager(HttpCache* http_cache) - : http_cache_(http_cache), weak_factory_(this) {} + : http_cache_(http_cache) {} HttpCacheLookupManager::~HttpCacheLookupManager() = default; diff --git a/net/http/http_cache_lookup_manager.h b/net/http/http_cache_lookup_manager.h index ba649cde90b88e..d7ece6785d7690 100644 --- a/net/http/http_cache_lookup_manager.h +++ b/net/http/http_cache_lookup_manager.h @@ -57,7 +57,7 @@ class NET_EXPORT_PRIVATE HttpCacheLookupManager : public ServerPushDelegate { // HttpCache must outlive the HttpCacheLookupManager. HttpCache* http_cache_; std::map> lookup_transactions_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; }; } // namespace net diff --git a/net/http/http_cache_transaction.cc b/net/http/http_cache_transaction.cc index d9e6d3ec348596..8ac21b2e4769f4 100644 --- a/net/http/http_cache_transaction.cc +++ b/net/http/http_cache_transaction.cc @@ -193,8 +193,7 @@ HttpCache::Transaction::Transaction(RequestPriority priority, HttpCache* cache) parallel_writing_pattern_(PARALLEL_WRITING_NONE), moved_network_transaction_to_writers_(false), websocket_handshake_stream_base_create_helper_(nullptr), - in_do_loop_(false), - weak_factory_(this) { + in_do_loop_(false) { TRACE_EVENT0("io", "HttpCacheTransaction::Transaction"); static_assert(HttpCache::Transaction::kNumValidationHeaders == base::size(kValidationHeaders), diff --git a/net/http/http_cache_transaction.h b/net/http/http_cache_transaction.h index 640f85181d442c..da341f2c2a0870 100644 --- a/net/http/http_cache_transaction.h +++ b/net/http/http_cache_transaction.h @@ -652,7 +652,7 @@ class NET_EXPORT_PRIVATE HttpCache::Transaction : public HttpTransaction { // True if the Transaction is currently processing the DoLoop. bool in_do_loop_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(Transaction); }; diff --git a/net/http/http_cache_writers.cc b/net/http/http_cache_writers.cc index c20d5d379363b1..5d8e78d22ddb62 100644 --- a/net/http/http_cache_writers.cc +++ b/net/http/http_cache_writers.cc @@ -50,7 +50,7 @@ HttpCache::Writers::TransactionInfo::TransactionInfo(const TransactionInfo&) = default; HttpCache::Writers::Writers(HttpCache* cache, HttpCache::ActiveEntry* entry) - : cache_(cache), entry_(entry), weak_factory_(this) {} + : cache_(cache), entry_(entry) {} HttpCache::Writers::~Writers() = default; diff --git a/net/http/http_cache_writers.h b/net/http/http_cache_writers.h index e914ab1026e78f..c638aeba65e90d 100644 --- a/net/http/http_cache_writers.h +++ b/net/http/http_cache_writers.h @@ -283,7 +283,7 @@ class NET_EXPORT_PRIVATE HttpCache::Writers { // end of DoLoop(). base::OnceClosure cache_callback_; // Callback for cache_. - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(Writers); }; diff --git a/net/http/http_proxy_connect_job.cc b/net/http/http_proxy_connect_job.cc index bc41834195ae4d..a9fbbdc38fd5a0 100644 --- a/net/http/http_proxy_connect_job.cc +++ b/net/http/http_proxy_connect_job.cc @@ -188,8 +188,7 @@ HttpProxyConnectJob::HttpProxyConnectJob( common_connect_job_params->http_auth_cache, common_connect_job_params->http_auth_handler_factory, host_resolver()) - : nullptr), - weak_ptr_factory_(this) {} + : nullptr) {} HttpProxyConnectJob::~HttpProxyConnectJob() {} diff --git a/net/http/http_proxy_connect_job.h b/net/http/http_proxy_connect_job.h index ef12a1e31a8eda..7a7b9677f55963 100644 --- a/net/http/http_proxy_connect_job.h +++ b/net/http/http_proxy_connect_job.h @@ -239,7 +239,7 @@ class NET_EXPORT_PRIVATE HttpProxyConnectJob : public ConnectJob, // Time when the connection to the proxy was started. base::TimeTicks connect_start_time_; - base::WeakPtrFactory weak_ptr_factory_; + base::WeakPtrFactory weak_ptr_factory_{this}; DISALLOW_COPY_AND_ASSIGN(HttpProxyConnectJob); }; diff --git a/net/http/http_response_body_drainer_unittest.cc b/net/http/http_response_body_drainer_unittest.cc index a1c3c96136eba5..b40cdca15b8aa5 100644 --- a/net/http/http_response_body_drainer_unittest.cc +++ b/net/http/http_response_body_drainer_unittest.cc @@ -85,8 +85,7 @@ class MockHttpStream : public HttpStream { is_sync_(false), is_last_chunk_zero_size_(false), is_complete_(false), - can_reuse_connection_(true), - weak_factory_(this) {} + can_reuse_connection_(true) {} ~MockHttpStream() override = default; // HttpStream implementation. @@ -177,7 +176,7 @@ class MockHttpStream : public HttpStream { bool is_complete_; bool can_reuse_connection_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(MockHttpStream); }; diff --git a/net/http/http_stream_factory_job.cc b/net/http/http_stream_factory_job.cc index 8fded9b08368ef..036dcde8e1ae57 100644 --- a/net/http/http_stream_factory_job.cc +++ b/net/http/http_stream_factory_job.cc @@ -169,8 +169,7 @@ HttpStreamFactory::Job::Job(Delegate* delegate, request_info_.socket_tag, request_info_.network_isolation_key)), stream_type_(HttpStreamRequest::BIDIRECTIONAL_STREAM), - init_connection_already_resumed_(false), - ptr_factory_(this) { + init_connection_already_resumed_(false) { // QUIC can only be spoken to servers, never to proxies. if (alternative_protocol == kProtoQUIC) DCHECK(proxy_info_.is_direct()); diff --git a/net/http/http_stream_factory_job.h b/net/http/http_stream_factory_job.h index 3a5488e312c52b..94d1a9190f8830 100644 --- a/net/http/http_stream_factory_job.h +++ b/net/http/http_stream_factory_job.h @@ -477,7 +477,7 @@ class HttpStreamFactory::Job std::unique_ptr spdy_session_request_; - base::WeakPtrFactory ptr_factory_; + base::WeakPtrFactory ptr_factory_{this}; DISALLOW_COPY_AND_ASSIGN(Job); }; diff --git a/net/http/http_stream_factory_job_controller.cc b/net/http/http_stream_factory_job_controller.cc index 3ec5177b56b196..c8b124b8622932 100644 --- a/net/http/http_stream_factory_job_controller.cc +++ b/net/http/http_stream_factory_job_controller.cc @@ -102,10 +102,9 @@ HttpStreamFactory::JobController::JobController( proxy_ssl_config_(proxy_ssl_config), num_streams_(0), priority_(IDLE), - net_log_( - NetLogWithSource::Make(session->net_log(), - NetLogSourceType::HTTP_STREAM_JOB_CONTROLLER)), - ptr_factory_(this) { + net_log_(NetLogWithSource::Make( + session->net_log(), + NetLogSourceType::HTTP_STREAM_JOB_CONTROLLER)) { DCHECK(factory); net_log_.BeginEvent(NetLogEventType::HTTP_STREAM_JOB_CONTROLLER, base::Bind(&NetLogJobControllerCallback, diff --git a/net/http/http_stream_factory_job_controller.h b/net/http/http_stream_factory_job_controller.h index f24cdd7a81f47b..783759ead81007 100644 --- a/net/http/http_stream_factory_job_controller.h +++ b/net/http/http_stream_factory_job_controller.h @@ -360,7 +360,7 @@ class HttpStreamFactory::JobController RequestPriority priority_; const NetLogWithSource net_log_; - base::WeakPtrFactory ptr_factory_; + base::WeakPtrFactory ptr_factory_{this}; }; } // namespace net diff --git a/net/http/http_stream_factory_unittest.cc b/net/http/http_stream_factory_unittest.cc index 21d6119d3e44a4..8162becae7c5c8 100644 --- a/net/http/http_stream_factory_unittest.cc +++ b/net/http/http_stream_factory_unittest.cc @@ -113,8 +113,7 @@ class MockWebSocketHandshakeStream : public WebSocketHandshakeStreamBase { kStreamTypeSpdy, }; - explicit MockWebSocketHandshakeStream(StreamType type) - : type_(type), weak_ptr_factory_(this) {} + explicit MockWebSocketHandshakeStream(StreamType type) : type_(type) {} ~MockWebSocketHandshakeStream() override = default; @@ -173,7 +172,7 @@ class MockWebSocketHandshakeStream : public WebSocketHandshakeStreamBase { private: const StreamType type_; - base::WeakPtrFactory weak_ptr_factory_; + base::WeakPtrFactory weak_ptr_factory_{this}; }; // HttpStreamFactory subclass that can wait until a preconnect is complete. diff --git a/net/http/http_stream_parser.cc b/net/http/http_stream_parser.cc index 6615a48c8fe01c..aa3874ce235b95 100644 --- a/net/http/http_stream_parser.cc +++ b/net/http/http_stream_parser.cc @@ -211,8 +211,7 @@ HttpStreamParser::HttpStreamParser(StreamSocket* stream_socket, connection_is_reused_(connection_is_reused), net_log_(net_log), sent_last_chunk_(false), - upload_error_(OK), - weak_ptr_factory_(this) { + upload_error_(OK) { io_callback_ = base::BindRepeating(&HttpStreamParser::OnIOComplete, weak_ptr_factory_.GetWeakPtr()); } diff --git a/net/http/http_stream_parser.h b/net/http/http_stream_parser.h index 16d24e247f2f43..0d559c3a828f96 100644 --- a/net/http/http_stream_parser.h +++ b/net/http/http_stream_parser.h @@ -303,7 +303,7 @@ class NET_EXPORT_PRIVATE HttpStreamParser { MutableNetworkTrafficAnnotationTag traffic_annotation_; - base::WeakPtrFactory weak_ptr_factory_; + base::WeakPtrFactory weak_ptr_factory_{this}; DISALLOW_COPY_AND_ASSIGN(HttpStreamParser); }; diff --git a/net/http/http_stream_parser_unittest.cc b/net/http/http_stream_parser_unittest.cc index 16b77a305fda53..e197da3fb5552d 100644 --- a/net/http/http_stream_parser_unittest.cc +++ b/net/http/http_stream_parser_unittest.cc @@ -71,7 +71,7 @@ class ReadErrorUploadDataStream : public UploadDataStream { enum class FailureMode { SYNC, ASYNC }; explicit ReadErrorUploadDataStream(FailureMode mode) - : UploadDataStream(true, 0), async_(mode), weak_factory_(this) {} + : UploadDataStream(true, 0), async_(mode) {} private: void CompleteRead() { UploadDataStream::OnReadCompleted(ERR_FAILED); } @@ -93,7 +93,7 @@ class ReadErrorUploadDataStream : public UploadDataStream { const FailureMode async_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(ReadErrorUploadDataStream); }; @@ -200,7 +200,7 @@ TEST(HttpStreamParser, DataReadErrorAsynchronous) { class InitAsyncUploadDataStream : public ChunkedUploadDataStream { public: explicit InitAsyncUploadDataStream(int64_t identifier) - : ChunkedUploadDataStream(identifier), weak_factory_(this) {} + : ChunkedUploadDataStream(identifier) {} private: void CompleteInit() { UploadDataStream::OnInitCompleted(OK); } @@ -212,7 +212,7 @@ class InitAsyncUploadDataStream : public ChunkedUploadDataStream { return ERR_IO_PENDING; } - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(InitAsyncUploadDataStream); }; diff --git a/net/http/http_transaction_test_util.cc b/net/http/http_transaction_test_util.cc index ce61d0978264d5..28b65dd17046f4 100644 --- a/net/http/http_transaction_test_util.cc +++ b/net/http/http_transaction_test_util.cc @@ -263,8 +263,7 @@ MockNetworkTransaction::MockNetworkTransaction(RequestPriority priority, sent_bytes_(0), socket_log_id_(NetLogSource::kInvalidId), done_reading_called_(false), - reading_(false), - weak_factory_(this) {} + reading_(false) {} MockNetworkTransaction::~MockNetworkTransaction() { // Use request_ as in ~HttpNetworkTransaction to make sure its valid and not diff --git a/net/http/http_transaction_test_util.h b/net/http/http_transaction_test_util.h index 745a31f1b9de17..f1724b0b4bde3c 100644 --- a/net/http/http_transaction_test_util.h +++ b/net/http/http_transaction_test_util.h @@ -291,8 +291,7 @@ class MockNetworkTransaction CompletionOnceCallback resume_start_callback_; // used for pause and restart. - base::WeakPtrFactory weak_factory_; - + base::WeakPtrFactory weak_factory_{this}; }; class MockNetworkLayer : public HttpTransactionFactory, diff --git a/net/http/partial_data.cc b/net/http/partial_data.cc index fa6b488e1044d4..e0eb396c7a35b5 100644 --- a/net/http/partial_data.cc +++ b/net/http/partial_data.cc @@ -41,8 +41,7 @@ PartialData::PartialData() final_range_(false), sparse_entry_(true), truncated_(false), - initial_validation_(false), - weak_factory_(this) {} + initial_validation_(false) {} PartialData::~PartialData() = default; diff --git a/net/http/partial_data.h b/net/http/partial_data.h index 0ca5926586ccba..3e8b1a406dc2c1 100644 --- a/net/http/partial_data.h +++ b/net/http/partial_data.h @@ -159,7 +159,7 @@ class PartialData { bool truncated_; // We have an incomplete 200 stored. bool initial_validation_; // Only used for truncated entries. CompletionOnceCallback callback_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(PartialData); }; diff --git a/net/http/transport_security_persister.cc b/net/http/transport_security_persister.cc index 804ea45d7d9672..0df5a0f78e3092 100644 --- a/net/http/transport_security_persister.cc +++ b/net/http/transport_security_persister.cc @@ -219,8 +219,7 @@ TransportSecurityPersister::TransportSecurityPersister( : transport_security_state_(state), writer_(profile_path.AppendASCII("TransportSecurity"), background_runner), foreground_runner_(base::ThreadTaskRunnerHandle::Get()), - background_runner_(background_runner), - weak_ptr_factory_(this) { + background_runner_(background_runner) { transport_security_state_->SetDelegate(this); base::PostTaskAndReplyWithResult( diff --git a/net/http/transport_security_persister.h b/net/http/transport_security_persister.h index bfc85cb336c960..c8ba1d882167ab 100644 --- a/net/http/transport_security_persister.h +++ b/net/http/transport_security_persister.h @@ -131,7 +131,7 @@ class NET_EXPORT TransportSecurityPersister scoped_refptr foreground_runner_; scoped_refptr background_runner_; - base::WeakPtrFactory weak_ptr_factory_; + base::WeakPtrFactory weak_ptr_factory_{this}; DISALLOW_COPY_AND_ASSIGN(TransportSecurityPersister); }; diff --git a/net/log/trace_net_log_observer.cc b/net/log/trace_net_log_observer.cc index a6ecb034581fbf..7b572840a0dce7 100644 --- a/net/log/trace_net_log_observer.cc +++ b/net/log/trace_net_log_observer.cc @@ -47,8 +47,7 @@ class TracedValue : public base::trace_event::ConvertableToTraceFormat { } // namespace -TraceNetLogObserver::TraceNetLogObserver() - : net_log_to_watch_(nullptr), weak_factory_(this) {} +TraceNetLogObserver::TraceNetLogObserver() : net_log_to_watch_(nullptr) {} TraceNetLogObserver::~TraceNetLogObserver() { DCHECK(!net_log_to_watch_); diff --git a/net/log/trace_net_log_observer.h b/net/log/trace_net_log_observer.h index 0d7d8567ec76f3..eea49c8a99a8eb 100644 --- a/net/log/trace_net_log_observer.h +++ b/net/log/trace_net_log_observer.h @@ -41,7 +41,7 @@ class NET_EXPORT TraceNetLogObserver private: NetLog* net_log_to_watch_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(TraceNetLogObserver); }; diff --git a/net/network_error_logging/network_error_logging_service.cc b/net/network_error_logging/network_error_logging_service.cc index cf75fb60628114..6603eb8ec59025 100644 --- a/net/network_error_logging/network_error_logging_service.cc +++ b/net/network_error_logging/network_error_logging_service.cc @@ -182,10 +182,7 @@ void RecordSignedExchangeRequestOutcome( class NetworkErrorLoggingServiceImpl : public NetworkErrorLoggingService { public: explicit NetworkErrorLoggingServiceImpl(PersistentNelStore* store) - : store_(store), - started_loading_policies_(false), - initialized_(false), - weak_factory_(this) { + : store_(store), started_loading_policies_(false), initialized_(false) { if (!PoliciesArePersisted()) initialized_ = true; } @@ -345,7 +342,7 @@ class NetworkErrorLoggingServiceImpl : public NetworkErrorLoggingService { // Backlog of tasks waiting on initialization. std::vector task_backlog_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; bool PoliciesArePersisted() const { return store_ != nullptr; } diff --git a/net/nqe/network_quality_estimator.cc b/net/nqe/network_quality_estimator.cc index b1f456ec89739a..d5b67307730eb9 100644 --- a/net/nqe/network_quality_estimator.cc +++ b/net/nqe/network_quality_estimator.cc @@ -174,8 +174,7 @@ NetworkQualityEstimator::NetworkQualityEstimator( net_log_(NetLogWithSource::Make( net_log, net::NetLogSourceType::NETWORK_QUALITY_ESTIMATOR)), - event_creator_(net_log_), - weak_ptr_factory_(this) { + event_creator_(net_log_) { DCHECK_EQ(nqe::internal::OBSERVATION_CATEGORY_COUNT, base::size(rtt_ms_observations_)); diff --git a/net/nqe/network_quality_estimator.h b/net/nqe/network_quality_estimator.h index 3c111ea0bb7dd1..32977a947bf884 100644 --- a/net/nqe/network_quality_estimator.h +++ b/net/nqe/network_quality_estimator.h @@ -698,7 +698,7 @@ class NET_EXPORT_PRIVATE NetworkQualityEstimator bool get_network_id_asynchronously_ = false; #endif - base::WeakPtrFactory weak_ptr_factory_; + base::WeakPtrFactory weak_ptr_factory_{this}; DISALLOW_COPY_AND_ASSIGN(NetworkQualityEstimator); }; diff --git a/net/nqe/network_quality_store.cc b/net/nqe/network_quality_store.cc index aa444b0560d813..102ad4bedfbb9c 100644 --- a/net/nqe/network_quality_store.cc +++ b/net/nqe/network_quality_store.cc @@ -15,7 +15,7 @@ namespace nqe { namespace internal { -NetworkQualityStore::NetworkQualityStore() : weak_ptr_factory_(this) { +NetworkQualityStore::NetworkQualityStore() { static_assert(kMaximumNetworkQualityCacheSize > 0, "Size of the network quality cache must be > 0"); // This limit should not be increased unless the logic for removing the diff --git a/net/nqe/network_quality_store.h b/net/nqe/network_quality_store.h index 5250e525999290..a1aedc35d61c44 100644 --- a/net/nqe/network_quality_store.h +++ b/net/nqe/network_quality_store.h @@ -99,7 +99,7 @@ class NET_EXPORT_PRIVATE NetworkQualityStore { SEQUENCE_CHECKER(sequence_checker_); - base::WeakPtrFactory weak_ptr_factory_; + base::WeakPtrFactory weak_ptr_factory_{this}; DISALLOW_COPY_AND_ASSIGN(NetworkQualityStore); }; diff --git a/net/proxy_resolution/pac_file_fetcher_impl.cc b/net/proxy_resolution/pac_file_fetcher_impl.cc index da10413fe1b5b8..506eeac97324cb 100644 --- a/net/proxy_resolution/pac_file_fetcher_impl.cc +++ b/net/proxy_resolution/pac_file_fetcher_impl.cc @@ -335,8 +335,7 @@ PacFileFetcherImpl::PacFileFetcherImpl(URLRequestContext* url_request_context, result_text_(nullptr), max_response_bytes_(kDefaultMaxResponseBytes), max_duration_(kDefaultMaxDuration), - allow_file_url_(allow_file_url), - weak_factory_(this) { + allow_file_url_(allow_file_url) { DCHECK(url_request_context); } diff --git a/net/proxy_resolution/pac_file_fetcher_impl.h b/net/proxy_resolution/pac_file_fetcher_impl.h index 7bc1daaacf1bc7..397bf2280202b8 100644 --- a/net/proxy_resolution/pac_file_fetcher_impl.h +++ b/net/proxy_resolution/pac_file_fetcher_impl.h @@ -161,7 +161,7 @@ class NET_EXPORT PacFileFetcherImpl : public PacFileFetcher, // Factory for creating the time-out task. This takes care of revoking // outstanding tasks when |this| is deleted. - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(PacFileFetcherImpl); }; diff --git a/net/proxy_resolution/proxy_resolution_service.cc b/net/proxy_resolution/proxy_resolution_service.cc index 9f906ae1939c0b..9d817f75287d5b 100644 --- a/net/proxy_resolution/proxy_resolution_service.cc +++ b/net/proxy_resolution/proxy_resolution_service.cc @@ -691,8 +691,7 @@ class ProxyResolutionService::PacFileDeciderPoller { dhcp_pac_file_fetcher_(dhcp_pac_file_fetcher), last_error_(init_net_error), last_script_data_(init_script_data), - last_poll_time_(TimeTicks::Now()), - weak_factory_(this) { + last_poll_time_(TimeTicks::Now()) { // Set the initial poll delay. next_poll_mode_ = poll_policy()->GetNextDelay( last_error_, TimeDelta::FromSeconds(-1), &next_poll_delay_); @@ -846,7 +845,7 @@ class ProxyResolutionService::PacFileDeciderPoller { bool quick_check_enabled_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(PacFileDeciderPoller); }; @@ -1066,8 +1065,7 @@ ProxyResolutionService::ProxyResolutionService( net_log_(net_log), stall_proxy_auto_config_delay_( TimeDelta::FromMilliseconds(kDelayAfterNetworkChangesMs)), - quick_check_enabled_(true), - weak_ptr_factory_(this) { + quick_check_enabled_(true) { NetworkChangeNotifier::AddIPAddressObserver(this); NetworkChangeNotifier::AddDNSObserver(this); config_service_->AddObserver(this); diff --git a/net/proxy_resolution/proxy_resolution_service.h b/net/proxy_resolution/proxy_resolution_service.h index d2f1edcd65878d..cf516ef503bda0 100644 --- a/net/proxy_resolution/proxy_resolution_service.h +++ b/net/proxy_resolution/proxy_resolution_service.h @@ -443,7 +443,7 @@ class NET_EXPORT ProxyResolutionService // Flag used by |SetReady()| to check if |this| has been deleted by a // synchronous callback. - base::WeakPtrFactory weak_ptr_factory_; + base::WeakPtrFactory weak_ptr_factory_{this}; DISALLOW_COPY_AND_ASSIGN(ProxyResolutionService); }; diff --git a/net/quic/bidirectional_stream_quic_impl.cc b/net/quic/bidirectional_stream_quic_impl.cc index 06392df0c9d363..444544501f30ba 100644 --- a/net/quic/bidirectional_stream_quic_impl.cc +++ b/net/quic/bidirectional_stream_quic_impl.cc @@ -54,8 +54,7 @@ BidirectionalStreamQuicImpl::BidirectionalStreamQuicImpl( closed_is_first_stream_(false), has_sent_headers_(false), send_request_headers_automatically_(true), - may_invoke_callbacks_(true), - weak_factory_(this) {} + may_invoke_callbacks_(true) {} BidirectionalStreamQuicImpl::~BidirectionalStreamQuicImpl() { if (stream_) { diff --git a/net/quic/bidirectional_stream_quic_impl.h b/net/quic/bidirectional_stream_quic_impl.h index aa5f938d5beba4..cb3927bcacca4d 100644 --- a/net/quic/bidirectional_stream_quic_impl.h +++ b/net/quic/bidirectional_stream_quic_impl.h @@ -128,7 +128,7 @@ class NET_EXPORT_PRIVATE BidirectionalStreamQuicImpl // True when callbacks to the delegate may be invoked synchronously. bool may_invoke_callbacks_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(BidirectionalStreamQuicImpl); }; diff --git a/net/quic/quic_chromium_alarm_factory.cc b/net/quic/quic_chromium_alarm_factory.cc index 9124fb0ee97f76..2eaf0bf7d7182d 100644 --- a/net/quic/quic_chromium_alarm_factory.cc +++ b/net/quic/quic_chromium_alarm_factory.cc @@ -23,8 +23,7 @@ class QuicChromeAlarm : public quic::QuicAlarm { : quic::QuicAlarm(std::move(delegate)), clock_(clock), task_runner_(task_runner), - task_deadline_(quic::QuicTime::Zero()), - weak_factory_(this) {} + task_deadline_(quic::QuicTime::Zero()) {} protected: void SetImpl() override { @@ -84,7 +83,7 @@ class QuicChromeAlarm : public quic::QuicAlarm { // post a new task when the new deadline now earlier than when // previously posted. quic::QuicTime task_deadline_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; }; } // namespace @@ -92,7 +91,7 @@ class QuicChromeAlarm : public quic::QuicAlarm { QuicChromiumAlarmFactory::QuicChromiumAlarmFactory( base::TaskRunner* task_runner, const quic::QuicClock* clock) - : task_runner_(task_runner), clock_(clock), weak_factory_(this) {} + : task_runner_(task_runner), clock_(clock) {} QuicChromiumAlarmFactory::~QuicChromiumAlarmFactory() {} diff --git a/net/quic/quic_chromium_alarm_factory.h b/net/quic/quic_chromium_alarm_factory.h index 1e4783356548ff..d190a05b23cfee 100644 --- a/net/quic/quic_chromium_alarm_factory.h +++ b/net/quic/quic_chromium_alarm_factory.h @@ -40,7 +40,7 @@ class NET_EXPORT_PRIVATE QuicChromiumAlarmFactory private: base::TaskRunner* task_runner_; const quic::QuicClock* clock_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(QuicChromiumAlarmFactory); }; diff --git a/net/quic/quic_chromium_client_session.cc b/net/quic/quic_chromium_client_session.cc index a4a7b34c07297c..adbe75141970ce 100644 --- a/net/quic/quic_chromium_client_session.cc +++ b/net/quic/quic_chromium_client_session.cc @@ -566,8 +566,7 @@ QuicChromiumClientSession::StreamRequest::StreamRequest( : session_(session), requires_confirmation_(requires_confirmation), stream_(nullptr), - traffic_annotation_(traffic_annotation), - weak_factory_(this) {} + traffic_annotation_(traffic_annotation) {} QuicChromiumClientSession::StreamRequest::~StreamRequest() { if (stream_) @@ -789,8 +788,7 @@ QuicChromiumClientSession::QuicChromiumClientSession( ignore_read_error_(false), headers_include_h2_stream_dependency_( headers_include_h2_stream_dependency && - this->connection()->transport_version() >= quic::QUIC_VERSION_43), - weak_factory_(this) { + this->connection()->transport_version() >= quic::QUIC_VERSION_43) { // Make sure connection migration and goaway on path degrading are not turned // on at the same time. DCHECK(!(migrate_session_early_v2_ && go_away_on_path_degrading_)); diff --git a/net/quic/quic_chromium_client_session.h b/net/quic/quic_chromium_client_session.h index 7f6b91954303df..35efd18afceb05 100644 --- a/net/quic/quic_chromium_client_session.h +++ b/net/quic/quic_chromium_client_session.h @@ -355,7 +355,7 @@ class NET_EXPORT_PRIVATE QuicChromiumClientSession const NetworkTrafficAnnotationTag traffic_annotation_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(StreamRequest); }; @@ -840,7 +840,7 @@ class NET_EXPORT_PRIVATE QuicChromiumClientSession bool headers_include_h2_stream_dependency_; Http2PriorityDependencies priority_dependency_state_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(QuicChromiumClientSession); }; diff --git a/net/quic/quic_chromium_client_stream.cc b/net/quic/quic_chromium_client_stream.cc index 7b0c7a98ccb028..a2ce78f0e51c5f 100644 --- a/net/quic/quic_chromium_client_stream.cc +++ b/net/quic/quic_chromium_client_stream.cc @@ -46,8 +46,7 @@ QuicChromiumClientStream::Handle::Handle(QuicChromiumClientStream* stream) read_headers_buffer_(nullptr), read_body_buffer_len_(0), net_error_(ERR_UNEXPECTED), - net_log_(stream->net_log()), - weak_factory_(this) { + net_log_(stream->net_log()) { SaveState(); } @@ -414,8 +413,7 @@ QuicChromiumClientStream::QuicChromiumClientStream( quic_version_(session->connection()->transport_version()), can_migrate_to_cellular_network_(true), initial_headers_frame_len_(0), - trailing_headers_frame_len_(0), - weak_factory_(this) {} + trailing_headers_frame_len_(0) {} QuicChromiumClientStream::QuicChromiumClientStream( quic::PendingStream* pending, @@ -432,8 +430,7 @@ QuicChromiumClientStream::QuicChromiumClientStream( quic_version_(session->connection()->transport_version()), can_migrate_to_cellular_network_(true), initial_headers_frame_len_(0), - trailing_headers_frame_len_(0), - weak_factory_(this) {} + trailing_headers_frame_len_(0) {} QuicChromiumClientStream::~QuicChromiumClientStream() { if (handle_) diff --git a/net/quic/quic_chromium_client_stream.h b/net/quic/quic_chromium_client_stream.h index b9773198451bd0..30baf2a5bbf88a 100644 --- a/net/quic/quic_chromium_client_stream.h +++ b/net/quic/quic_chromium_client_stream.h @@ -192,7 +192,7 @@ class NET_EXPORT_PRIVATE QuicChromiumClientStream NetLogWithSource net_log_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(Handle); }; @@ -311,7 +311,7 @@ class NET_EXPORT_PRIVATE QuicChromiumClientStream // Length of the HEADERS frame containing trailing headers. size_t trailing_headers_frame_len_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(QuicChromiumClientStream); }; diff --git a/net/quic/quic_chromium_packet_reader.cc b/net/quic/quic_chromium_packet_reader.cc index 4f7ec5bea4a1ad..c0c2bc707743a4 100644 --- a/net/quic/quic_chromium_packet_reader.cc +++ b/net/quic/quic_chromium_packet_reader.cc @@ -32,8 +32,7 @@ QuicChromiumPacketReader::QuicChromiumPacketReader( yield_after_(quic::QuicTime::Infinite()), read_buffer_(base::MakeRefCounted( static_cast(quic::kMaxOutgoingPacketSize))), - net_log_(net_log), - weak_factory_(this) {} + net_log_(net_log) {} QuicChromiumPacketReader::~QuicChromiumPacketReader() {} diff --git a/net/quic/quic_chromium_packet_reader.h b/net/quic/quic_chromium_packet_reader.h index 5734aa72711027..b4d250708168cb 100644 --- a/net/quic/quic_chromium_packet_reader.h +++ b/net/quic/quic_chromium_packet_reader.h @@ -70,7 +70,7 @@ class NET_EXPORT_PRIVATE QuicChromiumPacketReader { scoped_refptr read_buffer_; NetLogWithSource net_log_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(QuicChromiumPacketReader); }; diff --git a/net/quic/quic_chromium_packet_writer.cc b/net/quic/quic_chromium_packet_writer.cc index 4cb3be9f13ae3b..7c38674e70226f 100644 --- a/net/quic/quic_chromium_packet_writer.cc +++ b/net/quic/quic_chromium_packet_writer.cc @@ -81,7 +81,7 @@ void QuicChromiumPacketWriter::ReusableIOBuffer::Set(const char* buffer, std::memcpy(data(), buffer, buf_len); } -QuicChromiumPacketWriter::QuicChromiumPacketWriter() : weak_factory_(this) {} +QuicChromiumPacketWriter::QuicChromiumPacketWriter() {} QuicChromiumPacketWriter::QuicChromiumPacketWriter( DatagramClientSocket* socket, @@ -92,8 +92,7 @@ QuicChromiumPacketWriter::QuicChromiumPacketWriter( base::MakeRefCounted(quic::kMaxOutgoingPacketSize)), write_in_progress_(false), force_write_blocked_(false), - retry_count_(0), - weak_factory_(this) { + retry_count_(0) { retry_timer_.SetTaskRunner(task_runner); write_callback_ = base::BindRepeating( &QuicChromiumPacketWriter::OnWriteComplete, weak_factory_.GetWeakPtr()); diff --git a/net/quic/quic_chromium_packet_writer.h b/net/quic/quic_chromium_packet_writer.h index 1a667f2911e723..82acb30f3677ba 100644 --- a/net/quic/quic_chromium_packet_writer.h +++ b/net/quic/quic_chromium_packet_writer.h @@ -126,7 +126,7 @@ class NET_EXPORT_PRIVATE QuicChromiumPacketWriter base::OneShotTimer retry_timer_; CompletionRepeatingCallback write_callback_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(QuicChromiumPacketWriter); }; diff --git a/net/quic/quic_connectivity_probing_manager.cc b/net/quic/quic_connectivity_probing_manager.cc index 7f335131789a50..646d7ccf9b769f 100644 --- a/net/quic/quic_connectivity_probing_manager.cc +++ b/net/quic/quic_connectivity_probing_manager.cc @@ -63,8 +63,7 @@ QuicConnectivityProbingManager::QuicConnectivityProbingManager( network_(NetworkChangeNotifier::kInvalidNetworkHandle), retry_count_(0), probe_start_time_(base::TimeTicks()), - task_runner_(task_runner), - weak_factory_(this) { + task_runner_(task_runner) { retransmit_timer_.SetTaskRunner(task_runner_); } diff --git a/net/quic/quic_connectivity_probing_manager.h b/net/quic/quic_connectivity_probing_manager.h index e18ae03497898a..aa5bc7a1a5207f 100644 --- a/net/quic/quic_connectivity_probing_manager.h +++ b/net/quic/quic_connectivity_probing_manager.h @@ -128,7 +128,7 @@ class NET_EXPORT_PRIVATE QuicConnectivityProbingManager base::SequencedTaskRunner* task_runner_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(QuicConnectivityProbingManager); }; diff --git a/net/quic/quic_http_stream.cc b/net/quic/quic_http_stream.cc index e2bbe9a99c847b..0d1da7f8dab6ca 100644 --- a/net/quic/quic_http_stream.cc +++ b/net/quic/quic_http_stream.cc @@ -67,8 +67,7 @@ QuicHttpStream::QuicHttpStream( user_buffer_len_(0), session_error_(ERR_UNEXPECTED), found_promise_(false), - in_loop_(false), - weak_factory_(this) {} + in_loop_(false) {} QuicHttpStream::~QuicHttpStream() { CHECK(!in_loop_); diff --git a/net/quic/quic_http_stream.h b/net/quic/quic_http_stream.h index babc2a1690f130..0440c765387ebf 100644 --- a/net/quic/quic_http_stream.h +++ b/net/quic/quic_http_stream.h @@ -218,7 +218,7 @@ class NET_EXPORT_PRIVATE QuicHttpStream : public MultiplexedHttpStream { // Session connect timing info. LoadTimingInfo::ConnectTiming connect_timing_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(QuicHttpStream); }; diff --git a/net/quic/quic_http_stream_test.cc b/net/quic/quic_http_stream_test.cc index 0d1a74dd2dc452..eff65950ea41fa 100644 --- a/net/quic/quic_http_stream_test.cc +++ b/net/quic/quic_http_stream_test.cc @@ -115,7 +115,7 @@ class ReadErrorUploadDataStream : public UploadDataStream { enum class FailureMode { SYNC, ASYNC }; explicit ReadErrorUploadDataStream(FailureMode mode) - : UploadDataStream(true, 0), async_(mode), weak_factory_(this) {} + : UploadDataStream(true, 0), async_(mode) {} ~ReadErrorUploadDataStream() override {} private: @@ -138,7 +138,7 @@ class ReadErrorUploadDataStream : public UploadDataStream { const FailureMode async_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(ReadErrorUploadDataStream); }; diff --git a/net/quic/quic_proxy_client_socket.cc b/net/quic/quic_proxy_client_socket.cc index 3e925c90bee709..36c67d1164e66c 100644 --- a/net/quic/quic_proxy_client_socket.cc +++ b/net/quic/quic_proxy_client_socket.cc @@ -36,8 +36,7 @@ QuicProxyClientSocket::QuicProxyClientSocket( endpoint_(endpoint), auth_(auth_controller), user_agent_(user_agent), - net_log_(net_log), - weak_factory_(this) { + net_log_(net_log) { DCHECK(stream_->IsOpen()); request_.method = "CONNECT"; diff --git a/net/quic/quic_proxy_client_socket.h b/net/quic/quic_proxy_client_socket.h index d72aed881e77c9..299526c8488b35 100644 --- a/net/quic/quic_proxy_client_socket.h +++ b/net/quic/quic_proxy_client_socket.h @@ -145,7 +145,7 @@ class NET_EXPORT_PRIVATE QuicProxyClientSocket : public ProxyClientSocket { const NetLogWithSource net_log_; // The default weak pointer factory. - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(QuicProxyClientSocket); }; diff --git a/net/quic/quic_stream_factory.cc b/net/quic/quic_stream_factory.cc index d118d1ddd7520a..a4e2c6d0e239be 100644 --- a/net/quic/quic_stream_factory.cc +++ b/net/quic/quic_stream_factory.cc @@ -267,8 +267,7 @@ class QuicStreamFactory::CertVerifierJob { std::make_unique(cert_verify_flags, net_log)), start_time_(base::TimeTicks::Now()), - net_log_(net_log), - weak_factory_(this) {} + net_log_(net_log) {} ~CertVerifierJob() { if (verify_callback_) @@ -319,7 +318,7 @@ class QuicStreamFactory::CertVerifierJob { const base::TimeTicks start_time_; const NetLogWithSource net_log_; CompletionOnceCallback callback_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(CertVerifierJob); }; @@ -500,7 +499,7 @@ class QuicStreamFactory::Job { base::TimeTicks dns_resolution_start_time_; base::TimeTicks dns_resolution_end_time_; std::set stream_requests_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(Job); }; @@ -533,8 +532,7 @@ QuicStreamFactory::Job::Job(QuicStreamFactory* factory, host_resolution_finished_(false), connection_retried_(false), session_(nullptr), - network_(NetworkChangeNotifier::kInvalidNetworkHandle), - weak_factory_(this) { + network_(NetworkChangeNotifier::kInvalidNetworkHandle) { net_log_.BeginEvent( NetLogEventType::QUIC_STREAM_FACTORY_JOB, base::Bind(&NetLogQuicStreamFactoryJobCallback, &key_.server_id())); @@ -1156,8 +1154,7 @@ QuicStreamFactory::QuicStreamFactory( ssl_config_service_(ssl_config_service), enable_socket_recv_optimization_(enable_socket_recv_optimization), initial_rtt_for_handshake_milliseconds_( - initial_rtt_for_handshake_milliseconds), - weak_factory_(this) { + initial_rtt_for_handshake_milliseconds) { DCHECK(transport_security_state_); DCHECK(http_server_properties_); crypto_config_.set_user_agent_id(user_agent_id); diff --git a/net/quic/quic_stream_factory.h b/net/quic/quic_stream_factory.h index c3cc96f3af6cf2..a5de5f710a3216 100644 --- a/net/quic/quic_stream_factory.h +++ b/net/quic/quic_stream_factory.h @@ -634,7 +634,7 @@ class NET_EXPORT_PRIVATE QuicStreamFactory // The initial rtt for handshake. const int initial_rtt_for_handshake_milliseconds_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(QuicStreamFactory); }; diff --git a/net/reporting/reporting_delivery_agent.cc b/net/reporting/reporting_delivery_agent.cc index 31bfde7a136c25..c3069c93d27674 100644 --- a/net/reporting/reporting_delivery_agent.cc +++ b/net/reporting/reporting_delivery_agent.cc @@ -55,9 +55,7 @@ class ReportingDeliveryAgentImpl : public ReportingDeliveryAgent, public ReportingCacheObserver { public: ReportingDeliveryAgentImpl(ReportingContext* context) - : context_(context), - timer_(std::make_unique()), - weak_factory_(this) { + : context_(context), timer_(std::make_unique()) { context_->AddCacheObserver(this); } @@ -278,7 +276,7 @@ class ReportingDeliveryAgentImpl : public ReportingDeliveryAgent, // (Would be an unordered_set, but there's no hash on pair.) std::set pending_origin_groups_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(ReportingDeliveryAgentImpl); }; diff --git a/net/server/http_server.cc b/net/server/http_server.cc index 9b9116d9afd491..678d6f493c3389 100644 --- a/net/server/http_server.cc +++ b/net/server/http_server.cc @@ -56,8 +56,7 @@ HttpServer::HttpServer(std::unique_ptr server_socket, HttpServer::Delegate* delegate) : server_socket_(std::move(server_socket)), delegate_(delegate), - last_id_(0), - weak_ptr_factory_(this) { + last_id_(0) { DCHECK(server_socket_); // Start accepting connections in next run loop in case when delegate is not // ready to get callbacks. diff --git a/net/server/http_server.h b/net/server/http_server.h index c6e2554c6eeb37..cb70b575731c71 100644 --- a/net/server/http_server.h +++ b/net/server/http_server.h @@ -131,7 +131,7 @@ class HttpServer { int last_id_; std::map> id_to_connection_; - base::WeakPtrFactory weak_ptr_factory_; + base::WeakPtrFactory weak_ptr_factory_{this}; DISALLOW_COPY_AND_ASSIGN(HttpServer); }; diff --git a/net/socket/client_socket_pool_base_unittest.cc b/net/socket/client_socket_pool_base_unittest.cc index faa495115b4671..7ece03768d45a6 100644 --- a/net/socket/client_socket_pool_base_unittest.cc +++ b/net/socket/client_socket_pool_base_unittest.cc @@ -334,8 +334,7 @@ class TestConnectJob : public ConnectJob { client_socket_factory_(client_socket_factory), load_state_(LOAD_STATE_IDLE), has_established_connection_(false), - store_additional_error_state_(false), - weak_factory_(this) {} + store_additional_error_state_(false) {} void Signal() { DoConnect(waiting_success_, true /* async */, false /* recoverable */); @@ -524,7 +523,7 @@ class TestConnectJob : public ConnectJob { bool has_established_connection_; bool store_additional_error_state_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(TestConnectJob); }; diff --git a/net/socket/fuzzed_datagram_client_socket.cc b/net/socket/fuzzed_datagram_client_socket.cc index aea50374286994..db03e578df8a4e 100644 --- a/net/socket/fuzzed_datagram_client_socket.cc +++ b/net/socket/fuzzed_datagram_client_socket.cc @@ -30,7 +30,7 @@ const Error kWriteErrors[] = {ERR_FAILED, ERR_ADDRESS_UNREACHABLE, FuzzedDatagramClientSocket::FuzzedDatagramClientSocket( FuzzedDataProvider* data_provider) - : data_provider_(data_provider), weak_factory_(this) {} + : data_provider_(data_provider) {} FuzzedDatagramClientSocket::~FuzzedDatagramClientSocket() = default; diff --git a/net/socket/fuzzed_datagram_client_socket.h b/net/socket/fuzzed_datagram_client_socket.h index 9659becf48f634..f53eaecf430c01 100644 --- a/net/socket/fuzzed_datagram_client_socket.h +++ b/net/socket/fuzzed_datagram_client_socket.h @@ -91,7 +91,7 @@ class FuzzedDatagramClientSocket : public DatagramClientSocket { IPEndPoint remote_address_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(FuzzedDatagramClientSocket); }; diff --git a/net/socket/fuzzed_server_socket.cc b/net/socket/fuzzed_server_socket.cc index 7e2d4b94072c22..a5fc9dbe31afb3 100644 --- a/net/socket/fuzzed_server_socket.cc +++ b/net/socket/fuzzed_server_socket.cc @@ -18,8 +18,7 @@ FuzzedServerSocket::FuzzedServerSocket(FuzzedDataProvider* data_provider, : data_provider_(data_provider), net_log_(net_log), first_accept_(true), - listen_called_(false), - weak_factory_(this) {} + listen_called_(false) {} FuzzedServerSocket::~FuzzedServerSocket() = default; diff --git a/net/socket/fuzzed_server_socket.h b/net/socket/fuzzed_server_socket.h index 006fa85bfaf73d..03c6467246b611 100644 --- a/net/socket/fuzzed_server_socket.h +++ b/net/socket/fuzzed_server_socket.h @@ -52,7 +52,7 @@ class FuzzedServerSocket : public ServerSocket { bool first_accept_; bool listen_called_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(FuzzedServerSocket); }; diff --git a/net/socket/fuzzed_socket.cc b/net/socket/fuzzed_socket.cc index a71a6d5692950c..9952f2d826f782 100644 --- a/net/socket/fuzzed_socket.cc +++ b/net/socket/fuzzed_socket.cc @@ -40,8 +40,7 @@ FuzzedSocket::FuzzedSocket(FuzzedDataProvider* data_provider, net::NetLog* net_log) : data_provider_(data_provider), net_log_(NetLogWithSource::Make(net_log, NetLogSourceType::SOCKET)), - remote_address_(IPEndPoint(IPAddress::IPv4Localhost(), 80)), - weak_factory_(this) {} + remote_address_(IPEndPoint(IPAddress::IPv4Localhost(), 80)) {} FuzzedSocket::~FuzzedSocket() = default; diff --git a/net/socket/fuzzed_socket.h b/net/socket/fuzzed_socket.h index 63d069ee4f4270..8e420c10dacca6 100644 --- a/net/socket/fuzzed_socket.h +++ b/net/socket/fuzzed_socket.h @@ -131,7 +131,7 @@ class FuzzedSocket : public TransportClientSocket { IPEndPoint remote_address_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(FuzzedSocket); }; diff --git a/net/socket/socket_bio_adapter.cc b/net/socket/socket_bio_adapter.cc index 6e2496972e3a6c..6f134af6634af8 100644 --- a/net/socket/socket_bio_adapter.cc +++ b/net/socket/socket_bio_adapter.cc @@ -66,8 +66,7 @@ SocketBIOAdapter::SocketBIOAdapter(StreamSocket* socket, write_buffer_capacity_(write_buffer_capacity), write_buffer_used_(0), write_error_(OK), - delegate_(delegate), - weak_factory_(this) { + delegate_(delegate) { bio_.reset(BIO_new(&kBIOMethod)); bio_->ptr = this; bio_->init = 1; diff --git a/net/socket/socket_bio_adapter.h b/net/socket/socket_bio_adapter.h index 95475350b3c879..98421c701e4f71 100644 --- a/net/socket/socket_bio_adapter.h +++ b/net/socket/socket_bio_adapter.h @@ -136,7 +136,7 @@ class NET_EXPORT_PRIVATE SocketBIOAdapter { Delegate* delegate_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(SocketBIOAdapter); }; diff --git a/net/socket/socket_test_util.cc b/net/socket/socket_test_util.cc index 69c1f95d30fd9b..183e3a78b15c46 100644 --- a/net/socket/socket_test_util.cc +++ b/net/socket/socket_test_util.cc @@ -361,8 +361,7 @@ SequencedSocketData::SequencedSocketData(base::span reads, sequence_number_(0), read_state_(IDLE), write_state_(IDLE), - busy_before_sync_reads_(false), - weak_factory_(this) { + busy_before_sync_reads_(false) { // Check that reads and writes have a contiguous set of sequence numbers // starting from 0 and working their way up, with no repeats and skipping // no values. @@ -860,7 +859,7 @@ MockClientSocketFactory::CreateProxyClientSocket( } MockClientSocket::MockClientSocket(const NetLogWithSource& net_log) - : connected_(false), net_log_(net_log), weak_factory_(this) { + : connected_(false), net_log_(net_log) { local_addr_ = IPEndPoint(IPAddress(192, 0, 2, 33), 123); peer_addr_ = IPEndPoint(IPAddress(192, 0, 2, 33), 0); } @@ -1305,8 +1304,7 @@ MockProxyClientSocket::MockProxyClientSocket( : net_log_(socket->NetLog()), socket_(std::move(socket)), data_(data), - auth_controller_(auth_controller), - weak_factory_(this) { + auth_controller_(auth_controller) { DCHECK(data_); } @@ -1472,8 +1470,7 @@ MockSSLClientSocket::MockSSLClientSocket( SSLSocketDataProvider* data) : net_log_(stream_socket->NetLog()), stream_socket_(std::move(stream_socket)), - data_(data), - weak_factory_(this) { + data_(data) { DCHECK(data_); peer_addr_ = data->connect.peer_addr; } @@ -1674,8 +1671,7 @@ MockUDPClientSocket::MockUDPClientSocket(SocketDataProvider* data, network_(NetworkChangeNotifier::kInvalidNetworkHandle), pending_read_buf_(nullptr), pending_read_buf_len_(0), - net_log_(NetLogWithSource::Make(net_log, NetLogSourceType::NONE)), - weak_factory_(this) { + net_log_(NetLogWithSource::Make(net_log, NetLogSourceType::NONE)) { DCHECK(data_); data_->Initialize(this); peer_addr_ = data->connect_data().peer_addr; diff --git a/net/socket/socket_test_util.h b/net/socket/socket_test_util.h index 9a53e1cbcc0113..b9740cd19cf0cc 100644 --- a/net/socket/socket_test_util.h +++ b/net/socket/socket_test_util.h @@ -588,7 +588,7 @@ class SequencedSocketData : public SocketDataProvider { // Used by RunUntilPaused. NULL at all other times. std::unique_ptr run_until_paused_run_loop_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(SequencedSocketData); }; @@ -752,7 +752,7 @@ class MockClientSocket : public TransportClientSocket { NetLogWithSource net_log_; private: - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(MockClientSocket); }; @@ -913,7 +913,7 @@ class MockProxyClientSocket : public AsyncSocket, public ProxyClientSocket { ProxyClientSocketDataProvider* data_; scoped_refptr auth_controller_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(MockProxyClientSocket); }; @@ -995,7 +995,7 @@ class MockSSLClientSocket : public AsyncSocket, public SSLClientSocket { // Address of the "remote" peer we're connected to. IPEndPoint peer_addr_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(MockSSLClientSocket); }; @@ -1102,7 +1102,7 @@ class MockUDPClientSocket : public DatagramClientSocket, public AsyncSocket { bool data_transferred_ = false; bool tagged_before_data_transferred_ = true; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(MockUDPClientSocket); }; diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket_impl.cc index 19ca9e215972ee..292c1383828d97 100644 --- a/net/socket/ssl_client_socket_impl.cc +++ b/net/socket/ssl_client_socket_impl.cc @@ -427,8 +427,7 @@ SSLClientSocketImpl::SSLClientSocketImpl( policy_enforcer_(context.ct_policy_enforcer), pkp_bypassed_(false), is_fatal_cert_error_(false), - net_log_(stream_socket_->NetLog()), - weak_factory_(this) { + net_log_(stream_socket_->NetLog()) { CHECK(cert_verifier_); CHECK(transport_security_state_); CHECK(cert_transparency_verifier_); diff --git a/net/socket/ssl_client_socket_impl.h b/net/socket/ssl_client_socket_impl.h index f4a1a687664816..4facc3da7caf53 100644 --- a/net/socket/ssl_client_socket_impl.h +++ b/net/socket/ssl_client_socket_impl.h @@ -302,7 +302,7 @@ class SSLClientSocketImpl : public SSLClientSocket, bool is_fatal_cert_error_; NetLogWithSource net_log_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(SSLClientSocketImpl); }; diff --git a/net/socket/ssl_server_socket_impl.cc b/net/socket/ssl_server_socket_impl.cc index dac7d7e7ad747d..1fe8b18be18a6d 100644 --- a/net/socket/ssl_server_socket_impl.cc +++ b/net/socket/ssl_server_socket_impl.cc @@ -212,7 +212,7 @@ class SSLServerContextImpl::SocketImpl : public SSLServerSocket, NextProto negotiated_protocol_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(SocketImpl); }; @@ -228,8 +228,7 @@ SSLServerContextImpl::SocketImpl::SocketImpl( transport_socket_(std::move(transport_socket)), next_handshake_state_(STATE_NONE), completed_handshake_(false), - negotiated_protocol_(kProtoUnknown), - weak_factory_(this) { + negotiated_protocol_(kProtoUnknown) { ssl_.reset(SSL_new(context_->ssl_ctx_.get())); SSL_set_app_data(ssl_.get(), this); SSL_set_shed_handshake_config(ssl_.get(), 1); diff --git a/net/socket/ssl_server_socket_unittest.cc b/net/socket/ssl_server_socket_unittest.cc index 8a8095b082e141..200b90a280236a 100644 --- a/net/socket/ssl_server_socket_unittest.cc +++ b/net/socket/ssl_server_socket_unittest.cc @@ -103,11 +103,7 @@ class MockCTPolicyEnforcer : public CTPolicyEnforcer { class FakeDataChannel { public: FakeDataChannel() - : read_buf_len_(0), - closed_(false), - write_called_after_close_(false), - weak_factory_(this) { - } + : read_buf_len_(0), closed_(false), write_called_after_close_(false) {} int Read(IOBuffer* buf, int buf_len, CompletionOnceCallback callback) { DCHECK(read_callback_.is_null()); @@ -214,7 +210,7 @@ class FakeDataChannel { // asynchronously. bool write_called_after_close_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(FakeDataChannel); }; diff --git a/net/socket/tcp_client_socket.cc b/net/socket/tcp_client_socket.cc index 088d76823bd79e..46d0a7d585498a 100644 --- a/net/socket/tcp_client_socket.cc +++ b/net/socket/tcp_client_socket.cc @@ -142,8 +142,7 @@ TCPClientSocket::TCPClientSocket(std::unique_ptr socket, previously_disconnected_(false), total_received_bytes_(0), was_ever_used_(false), - was_disconnected_on_suspend_(false), - weak_ptr_factory_(this) { + was_disconnected_on_suspend_(false) { DCHECK(socket_); if (socket_->IsValid()) socket_->SetDefaultOptionsForClient(); diff --git a/net/socket/tcp_client_socket.h b/net/socket/tcp_client_socket.h index 1bf00384458aac..306c6b359e11e3 100644 --- a/net/socket/tcp_client_socket.h +++ b/net/socket/tcp_client_socket.h @@ -207,7 +207,7 @@ class NET_EXPORT TCPClientSocket : public TransportClientSocket, // Connect() or Disconnect() is called. bool was_disconnected_on_suspend_; - base::WeakPtrFactory weak_ptr_factory_; + base::WeakPtrFactory weak_ptr_factory_{this}; DISALLOW_COPY_AND_ASSIGN(TCPClientSocket); }; diff --git a/net/socket/transport_client_socket_pool.cc b/net/socket/transport_client_socket_pool.cc index a69add8a5bcf09..86f647c108620c 100644 --- a/net/socket/transport_client_socket_pool.cc +++ b/net/socket/transport_client_socket_pool.cc @@ -780,8 +780,7 @@ TransportClientSocketPool::TransportClientSocketPool( connect_job_factory_(std::move(connect_job_factory)), connect_backup_jobs_enabled_(connect_backup_jobs_enabled && g_connect_backup_jobs_enabled), - ssl_config_service_(ssl_config_service), - weak_factory_(this) { + ssl_config_service_(ssl_config_service) { DCHECK_LE(0, max_sockets_per_group); DCHECK_LE(max_sockets_per_group, max_sockets); diff --git a/net/socket/transport_client_socket_pool.h b/net/socket/transport_client_socket_pool.h index 2f61148245d825..02ac61e95b58a6 100644 --- a/net/socket/transport_client_socket_pool.h +++ b/net/socket/transport_client_socket_pool.h @@ -795,7 +795,7 @@ class NET_EXPORT_PRIVATE TransportClientSocketPool SSLConfigService* const ssl_config_service_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(TransportClientSocketPool); }; diff --git a/net/socket/transport_client_socket_pool_test_util.cc b/net/socket/transport_client_socket_pool_test_util.cc index bf8b36601a4df8..8d67fbffaadde8 100644 --- a/net/socket/transport_client_socket_pool_test_util.cc +++ b/net/socket/transport_client_socket_pool_test_util.cc @@ -194,8 +194,7 @@ class MockTriggerableClientSocket : public TransportClientSocket { : should_connect_(should_connect), is_connected_(false), addrlist_(addrlist), - net_log_(NetLogWithSource::Make(net_log, NetLogSourceType::SOCKET)), - weak_factory_(this) {} + net_log_(NetLogWithSource::Make(net_log, NetLogSourceType::SOCKET)) {} // Call this method to get a closure which will trigger the connect callback // when called. The closure can be called even after the socket is deleted; it @@ -322,7 +321,7 @@ class MockTriggerableClientSocket : public TransportClientSocket { CompletionOnceCallback callback_; ConnectionAttempts connection_attempts_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(MockTriggerableClientSocket); }; diff --git a/net/socket/transport_connect_job.cc b/net/socket/transport_connect_job.cc index 047ac7add560bc..dafaecab3698a1 100644 --- a/net/socket/transport_connect_job.cc +++ b/net/socket/transport_connect_job.cc @@ -101,8 +101,7 @@ TransportConnectJob::TransportConnectJob( NetLogEventType::TRANSPORT_CONNECT_JOB_CONNECT), params_(params), next_state_(STATE_NONE), - resolve_result_(OK), - weak_ptr_factory_(this) { + resolve_result_(OK) { // This is only set for WebSockets. DCHECK(!common_connect_job_params->websocket_endpoint_lock_manager); } diff --git a/net/socket/transport_connect_job.h b/net/socket/transport_connect_job.h index 0258e52eb4206b..69b763d30079b2 100644 --- a/net/socket/transport_connect_job.h +++ b/net/socket/transport_connect_job.h @@ -170,7 +170,7 @@ class NET_EXPORT_PRIVATE TransportConnectJob : public ConnectJob { ConnectionAttempts connection_attempts_; ConnectionAttempts fallback_connection_attempts_; - base::WeakPtrFactory weak_ptr_factory_; + base::WeakPtrFactory weak_ptr_factory_{this}; DISALLOW_COPY_AND_ASSIGN(TransportConnectJob); }; diff --git a/net/socket/udp_socket_perftest.cc b/net/socket/udp_socket_perftest.cc index 4c3408284b498b..05018fffbe8796 100644 --- a/net/socket/udp_socket_perftest.cc +++ b/net/socket/udp_socket_perftest.cc @@ -30,8 +30,7 @@ namespace { class UDPSocketPerfTest : public PlatformTest { public: UDPSocketPerfTest() - : buffer_(base::MakeRefCounted(kPacketSize)), - weak_factory_(this) {} + : buffer_(base::MakeRefCounted(kPacketSize)) {} void DoneWritePacketsToSocket(UDPClientSocket* socket, int num_of_packets, @@ -52,7 +51,7 @@ class UDPSocketPerfTest : public PlatformTest { protected: static const int kPacketSize = 1024; scoped_refptr buffer_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; }; const int UDPSocketPerfTest::kPacketSize; diff --git a/net/socket/udp_socket_posix.cc b/net/socket/udp_socket_posix.cc index 08bf79c75c10ea..f09bd573b70a4d 100644 --- a/net/socket/udp_socket_posix.cc +++ b/net/socket/udp_socket_posix.cc @@ -200,8 +200,7 @@ UDPSocketPosix::UDPSocketPosix(DatagramSocket::BindType bind_type, write_buf_len_(0), net_log_(NetLogWithSource::Make(net_log, NetLogSourceType::UDP_SOCKET)), bound_network_(NetworkChangeNotifier::kInvalidNetworkHandle), - experimental_recv_optimization_enabled_(false), - weak_factory_(this) { + experimental_recv_optimization_enabled_(false) { net_log_.BeginEvent(NetLogEventType::SOCKET_ALIVE, source.ToEventParametersCallback()); } diff --git a/net/socket/udp_socket_posix.h b/net/socket/udp_socket_posix.h index c62b4a881471aa..ce96046e720612 100644 --- a/net/socket/udp_socket_posix.h +++ b/net/socket/udp_socket_posix.h @@ -632,7 +632,7 @@ class NET_EXPORT UDPSocketPosix { THREAD_CHECKER(thread_checker_); // Used for alternate writes that are posted for concurrent execution. - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(UDPSocketPosix); }; diff --git a/net/socket/udp_socket_posix_unittest.cc b/net/socket/udp_socket_posix_unittest.cc index 42a42a16287bce..b4a773fd319658 100644 --- a/net/socket/udp_socket_posix_unittest.cc +++ b/net/socket/udp_socket_posix_unittest.cc @@ -133,8 +133,7 @@ class UDPSocketPosixTest : public TestWithScopedTaskEnvironment { : TestWithScopedTaskEnvironment( base::test::ScopedTaskEnvironment::MainThreadType::MOCK_TIME), socket_(DatagramSocket::DEFAULT_BIND, &client_log_, NetLogSource()), - callback_fired_(false), - weak_factory_(this) { + callback_fired_(false) { write_callback_ = base::BindRepeating(&UDPSocketPosixTest::OnWriteComplete, weak_factory_.GetWeakPtr()); } @@ -236,7 +235,7 @@ class UDPSocketPosixTest : public TestWithScopedTaskEnvironment { struct iovec msg_iov_[kNumMsgs]; struct mmsghdr msgvec_[kNumMsgs]; #endif - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; }; TEST_F(UDPSocketPosixTest, InternalSendBuffers) { diff --git a/net/socket/websocket_endpoint_lock_manager.cc b/net/socket/websocket_endpoint_lock_manager.cc index cdf90aa8132004..9124b235aa53e0 100644 --- a/net/socket/websocket_endpoint_lock_manager.cc +++ b/net/socket/websocket_endpoint_lock_manager.cc @@ -47,8 +47,7 @@ WebSocketEndpointLockManager::LockReleaser::~LockReleaser() { WebSocketEndpointLockManager::WebSocketEndpointLockManager() : unlock_delay_(base::TimeDelta::FromMilliseconds(kUnlockDelayInMs)), - pending_unlock_count_(0), - weak_factory_(this) {} + pending_unlock_count_(0) {} WebSocketEndpointLockManager::~WebSocketEndpointLockManager() { DCHECK_EQ(lock_info_map_.size(), pending_unlock_count_); diff --git a/net/socket/websocket_endpoint_lock_manager.h b/net/socket/websocket_endpoint_lock_manager.h index 2d7cdf5ea8d92f..4e96c736a10eea 100644 --- a/net/socket/websocket_endpoint_lock_manager.h +++ b/net/socket/websocket_endpoint_lock_manager.h @@ -130,7 +130,7 @@ class NET_EXPORT_PRIVATE WebSocketEndpointLockManager { // Number of sockets currently pending unlock. size_t pending_unlock_count_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(WebSocketEndpointLockManager); }; diff --git a/net/socket/websocket_transport_client_socket_pool.cc b/net/socket/websocket_transport_client_socket_pool.cc index 820288f6c664e4..82026990c4e5c8 100644 --- a/net/socket/websocket_transport_client_socket_pool.cc +++ b/net/socket/websocket_transport_client_socket_pool.cc @@ -36,8 +36,7 @@ WebSocketTransportClientSocketPool::WebSocketTransportClientSocketPool( common_connect_job_params_(common_connect_job_params), max_sockets_(max_sockets), handed_out_socket_count_(0), - flushing_(false), - weak_factory_(this) { + flushing_(false) { DCHECK(common_connect_job_params_->websocket_endpoint_lock_manager); } diff --git a/net/socket/websocket_transport_client_socket_pool.h b/net/socket/websocket_transport_client_socket_pool.h index f1d5f0d949725b..904e71975d276c 100644 --- a/net/socket/websocket_transport_client_socket_pool.h +++ b/net/socket/websocket_transport_client_socket_pool.h @@ -211,7 +211,7 @@ class NET_EXPORT_PRIVATE WebSocketTransportClientSocketPool int handed_out_socket_count_; bool flushing_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(WebSocketTransportClientSocketPool); }; diff --git a/net/socket/websocket_transport_connect_job.cc b/net/socket/websocket_transport_connect_job.cc index 1b80ee695853d2..5510ec197e4d4c 100644 --- a/net/socket/websocket_transport_connect_job.cc +++ b/net/socket/websocket_transport_connect_job.cc @@ -41,8 +41,7 @@ WebSocketTransportConnectJob::WebSocketTransportConnectJob( next_state_(STATE_NONE), race_result_(TransportConnectJob::RACE_UNKNOWN), had_ipv4_(false), - had_ipv6_(false), - weak_ptr_factory_(this) { + had_ipv6_(false) { DCHECK(common_connect_job_params->websocket_endpoint_lock_manager); } diff --git a/net/socket/websocket_transport_connect_job.h b/net/socket/websocket_transport_connect_job.h index 6ba51a0840cb67..cfd0ed388905ac 100644 --- a/net/socket/websocket_transport_connect_job.h +++ b/net/socket/websocket_transport_connect_job.h @@ -106,7 +106,7 @@ class NET_EXPORT_PRIVATE WebSocketTransportConnectJob : public ConnectJob { bool had_ipv4_; bool had_ipv6_; - base::WeakPtrFactory weak_ptr_factory_; + base::WeakPtrFactory weak_ptr_factory_{this}; DISALLOW_COPY_AND_ASSIGN(WebSocketTransportConnectJob); }; diff --git a/net/spdy/bidirectional_stream_spdy_impl.cc b/net/spdy/bidirectional_stream_spdy_impl.cc index 32d0999841e93c..f428a759d5a413 100644 --- a/net/spdy/bidirectional_stream_spdy_impl.cc +++ b/net/spdy/bidirectional_stream_spdy_impl.cc @@ -45,8 +45,7 @@ BidirectionalStreamSpdyImpl::BidirectionalStreamSpdyImpl( closed_stream_status_(ERR_FAILED), closed_stream_received_bytes_(0), closed_stream_sent_bytes_(0), - closed_has_load_timing_info_(false), - weak_factory_(this) {} + closed_has_load_timing_info_(false) {} BidirectionalStreamSpdyImpl::~BidirectionalStreamSpdyImpl() { // Sends a RST to the remote if the stream is destroyed before it completes. diff --git a/net/spdy/bidirectional_stream_spdy_impl.h b/net/spdy/bidirectional_stream_spdy_impl.h index 7266e66f0d41c9..954a678252af77 100644 --- a/net/spdy/bidirectional_stream_spdy_impl.h +++ b/net/spdy/bidirectional_stream_spdy_impl.h @@ -130,7 +130,7 @@ class NET_EXPORT_PRIVATE BidirectionalStreamSpdyImpl // Keep a reference here so it is alive until OnDataSent is invoked. scoped_refptr pending_combined_buffer_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(BidirectionalStreamSpdyImpl); }; diff --git a/net/spdy/spdy_http_stream.cc b/net/spdy/spdy_http_stream.cc index e4515883f56b54..438d41a4d4513b 100644 --- a/net/spdy/spdy_http_stream.cc +++ b/net/spdy/spdy_http_stream.cc @@ -121,8 +121,7 @@ SpdyHttpStream::SpdyHttpStream(const base::WeakPtr& spdy_session, request_body_buf_size_(0), buffered_read_callback_pending_(false), more_read_data_pending_(false), - was_alpn_negotiated_(false), - weak_factory_(this) { + was_alpn_negotiated_(false) { DCHECK(spdy_session_.get()); } diff --git a/net/spdy/spdy_http_stream.h b/net/spdy/spdy_http_stream.h index 643c4f374cebb7..a647849b2b04c2 100644 --- a/net/spdy/spdy_http_stream.h +++ b/net/spdy/spdy_http_stream.h @@ -233,7 +233,7 @@ class NET_EXPORT_PRIVATE SpdyHttpStream : public SpdyStream::Delegate, base::debug::StackTrace stack_trace_; #endif - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(SpdyHttpStream); }; diff --git a/net/spdy/spdy_http_stream_unittest.cc b/net/spdy/spdy_http_stream_unittest.cc index 6993bbbeb88d73..fd8484702d7efc 100644 --- a/net/spdy/spdy_http_stream_unittest.cc +++ b/net/spdy/spdy_http_stream_unittest.cc @@ -76,7 +76,7 @@ class ReadErrorUploadDataStream : public UploadDataStream { enum class FailureMode { SYNC, ASYNC }; explicit ReadErrorUploadDataStream(FailureMode mode) - : UploadDataStream(true, 0), async_(mode), weak_factory_(this) {} + : UploadDataStream(true, 0), async_(mode) {} private: void CompleteRead() { UploadDataStream::OnReadCompleted(ERR_FAILED); } @@ -98,7 +98,7 @@ class ReadErrorUploadDataStream : public UploadDataStream { const FailureMode async_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(ReadErrorUploadDataStream); }; diff --git a/net/spdy/spdy_proxy_client_socket.cc b/net/spdy/spdy_proxy_client_socket.cc index 3330305217307c..ee9883f65a2dea 100644 --- a/net/spdy/spdy_proxy_client_socket.cc +++ b/net/spdy/spdy_proxy_client_socket.cc @@ -46,9 +46,7 @@ SpdyProxyClientSocket::SpdyProxyClientSocket( was_ever_used_(false), net_log_(NetLogWithSource::Make(spdy_stream->net_log().net_log(), NetLogSourceType::PROXY_CLIENT_SOCKET)), - source_dependency_(source_net_log.source()), - weak_factory_(this), - write_callback_weak_factory_(this) { + source_dependency_(source_net_log.source()) { request_.method = "CONNECT"; request_.url = GURL("https://" + endpoint.ToString()); net_log_.BeginEvent(NetLogEventType::SOCKET_ALIVE, diff --git a/net/spdy/spdy_proxy_client_socket.h b/net/spdy/spdy_proxy_client_socket.h index 02a2ecf972b10c..eb47162cf2e39b 100644 --- a/net/spdy/spdy_proxy_client_socket.h +++ b/net/spdy/spdy_proxy_client_socket.h @@ -173,11 +173,12 @@ class NET_EXPORT_PRIVATE SpdyProxyClientSocket : public ProxyClientSocket, const NetLogSource source_dependency_; // The default weak pointer factory. - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; // Only used for posting write callbacks. Weak pointers created by this // factory are invalidated in Disconnect(). - base::WeakPtrFactory write_callback_weak_factory_; + base::WeakPtrFactory write_callback_weak_factory_{ + this}; DISALLOW_COPY_AND_ASSIGN(SpdyProxyClientSocket); }; diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc index db133a9d4768e8..3f9913d82aee41 100644 --- a/net/spdy/spdy_session.cc +++ b/net/spdy/spdy_session.cc @@ -646,7 +646,7 @@ spdy::SpdyErrorCode MapNetErrorToGoAwayStatus(Error err) { } } -SpdyStreamRequest::SpdyStreamRequest() : weak_ptr_factory_(this) { +SpdyStreamRequest::SpdyStreamRequest() { Reset(); } @@ -953,8 +953,7 @@ SpdySession::SpdySession( base::TimeDelta::FromSeconds(kDefaultConnectionAtRiskOfLossSeconds)), hung_interval_(base::TimeDelta::FromSeconds(kHungIntervalSeconds)), time_func_(time_func), - network_quality_estimator_(network_quality_estimator), - weak_factory_(this) { + network_quality_estimator_(network_quality_estimator) { net_log_.BeginEvent( NetLogEventType::HTTP2_SESSION, base::Bind(&NetLogSpdySessionCallback, &host_port_proxy_pair())); diff --git a/net/spdy/spdy_session.h b/net/spdy/spdy_session.h index f936200a4fc190..7de36a4be8e5db 100644 --- a/net/spdy/spdy_session.h +++ b/net/spdy/spdy_session.h @@ -285,7 +285,7 @@ class NET_EXPORT_PRIVATE SpdyStreamRequest { MutableNetworkTrafficAnnotationTag traffic_annotation_; State next_state_; - base::WeakPtrFactory weak_ptr_factory_; + base::WeakPtrFactory weak_ptr_factory_{this}; DISALLOW_COPY_AND_ASSIGN(SpdyStreamRequest); }; @@ -1212,7 +1212,7 @@ class NET_EXPORT SpdySession : public BufferedSpdyFramerVisitorInterface, // SpdySession is refcounted because we don't need to keep the SpdySession // alive if the last reference is within a RunnableMethod. Just revoke the // method. - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; }; } // namespace net diff --git a/net/spdy/spdy_session_pool.cc b/net/spdy/spdy_session_pool.cc index 924c40c1a38060..7a6e27fc276a2b 100644 --- a/net/spdy/spdy_session_pool.cc +++ b/net/spdy/spdy_session_pool.cc @@ -103,8 +103,7 @@ SpdySessionPool::SpdySessionPool( greased_http2_frame_(greased_http2_frame), time_func_(time_func), push_delegate_(nullptr), - network_quality_estimator_(network_quality_estimator), - weak_ptr_factory_(this) { + network_quality_estimator_(network_quality_estimator) { NetworkChangeNotifier::AddIPAddressObserver(this); if (ssl_config_service_) ssl_config_service_->AddObserver(this); diff --git a/net/spdy/spdy_session_pool.h b/net/spdy/spdy_session_pool.h index 143d5645aedff5..3dbfba25f29b5d 100644 --- a/net/spdy/spdy_session_pool.h +++ b/net/spdy/spdy_session_pool.h @@ -447,7 +447,7 @@ class NET_EXPORT SpdySessionPool NetworkQualityEstimator* network_quality_estimator_; - base::WeakPtrFactory weak_ptr_factory_; + base::WeakPtrFactory weak_ptr_factory_{this}; DISALLOW_COPY_AND_ASSIGN(SpdySessionPool); }; diff --git a/net/spdy/spdy_stream.cc b/net/spdy/spdy_stream.cc index 05802569432be2..93e68b3cc7ed34 100644 --- a/net/spdy/spdy_stream.cc +++ b/net/spdy/spdy_stream.cc @@ -111,8 +111,7 @@ SpdyStream::SpdyStream(SpdyStreamType type, raw_sent_bytes_(0), recv_bytes_(0), write_handler_guard_(false), - traffic_annotation_(traffic_annotation), - weak_ptr_factory_(this) { + traffic_annotation_(traffic_annotation) { CHECK(type_ == SPDY_BIDIRECTIONAL_STREAM || type_ == SPDY_REQUEST_RESPONSE_STREAM || type_ == SPDY_PUSH_STREAM); diff --git a/net/spdy/spdy_stream.h b/net/spdy/spdy_stream.h index a7a8e7b4c53eda..efdc0d9b0229b1 100644 --- a/net/spdy/spdy_stream.h +++ b/net/spdy/spdy_stream.h @@ -530,7 +530,7 @@ class NET_EXPORT_PRIVATE SpdyStream { const NetworkTrafficAnnotationTag traffic_annotation_; - base::WeakPtrFactory weak_ptr_factory_; + base::WeakPtrFactory weak_ptr_factory_{this}; DISALLOW_COPY_AND_ASSIGN(SpdyStream); }; diff --git a/net/ssl/threaded_ssl_private_key.cc b/net/ssl/threaded_ssl_private_key.cc index 67597609f77a71..df24528c8eda53 100644 --- a/net/ssl/threaded_ssl_private_key.cc +++ b/net/ssl/threaded_ssl_private_key.cc @@ -53,8 +53,7 @@ ThreadedSSLPrivateKey::ThreadedSSLPrivateKey( std::unique_ptr delegate, scoped_refptr task_runner) : core_(new Core(std::move(delegate))), - task_runner_(std::move(task_runner)), - weak_factory_(this) {} + task_runner_(std::move(task_runner)) {} std::string ThreadedSSLPrivateKey::GetProviderName() { return core_->delegate()->GetProviderName(); diff --git a/net/ssl/threaded_ssl_private_key.h b/net/ssl/threaded_ssl_private_key.h index 87dd94a8456047..21c0483046a333 100644 --- a/net/ssl/threaded_ssl_private_key.h +++ b/net/ssl/threaded_ssl_private_key.h @@ -81,7 +81,7 @@ class ThreadedSSLPrivateKey : public SSLPrivateKey { scoped_refptr core_; scoped_refptr task_runner_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(ThreadedSSLPrivateKey); }; diff --git a/net/test/embedded_test_server/controllable_http_response.cc b/net/test/embedded_test_server/controllable_http_response.cc index bb509015cf5d57..e7470f2bf7132d 100644 --- a/net/test/embedded_test_server/controllable_http_response.cc +++ b/net/test/embedded_test_server/controllable_http_response.cc @@ -45,8 +45,7 @@ class ControllableHttpResponse::Interceptor : public HttpResponse { ControllableHttpResponse::ControllableHttpResponse( EmbeddedTestServer* embedded_test_server, const std::string& relative_url, - bool relative_url_is_prefix) - : weak_ptr_factory_(this) { + bool relative_url_is_prefix) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); embedded_test_server->RegisterRequestHandler(base::BindRepeating( RequestHandler, weak_ptr_factory_.GetWeakPtr(), diff --git a/net/test/embedded_test_server/controllable_http_response.h b/net/test/embedded_test_server/controllable_http_response.h index efb23fda7e2578..22406a70056d4e 100644 --- a/net/test/embedded_test_server/controllable_http_response.h +++ b/net/test/embedded_test_server/controllable_http_response.h @@ -88,7 +88,7 @@ class ControllableHttpResponse { SEQUENCE_CHECKER(sequence_checker_); - base::WeakPtrFactory weak_ptr_factory_; + base::WeakPtrFactory weak_ptr_factory_{this}; DISALLOW_COPY_AND_ASSIGN(ControllableHttpResponse); }; diff --git a/net/test/embedded_test_server/embedded_test_server.cc b/net/test/embedded_test_server/embedded_test_server.cc index b24b44f50ed664..6ebe322c577b09 100644 --- a/net/test/embedded_test_server/embedded_test_server.cc +++ b/net/test/embedded_test_server/embedded_test_server.cc @@ -50,8 +50,7 @@ EmbeddedTestServer::EmbeddedTestServer(Type type) : is_using_ssl_(type == TYPE_HTTPS), connection_listener_(nullptr), port_(0), - cert_(CERT_OK), - weak_factory_(this) { + cert_(CERT_OK) { DCHECK(thread_checker_.CalledOnValidThread()); if (!is_using_ssl_) diff --git a/net/test/embedded_test_server/embedded_test_server.h b/net/test/embedded_test_server/embedded_test_server.h index 7978c024282108..cb41613711fc37 100644 --- a/net/test/embedded_test_server/embedded_test_server.h +++ b/net/test/embedded_test_server/embedded_test_server.h @@ -319,7 +319,7 @@ class EmbeddedTestServer { ServerCertificate cert_; std::unique_ptr context_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(EmbeddedTestServer); }; diff --git a/net/test/embedded_test_server/embedded_test_server_unittest.cc b/net/test/embedded_test_server/embedded_test_server_unittest.cc index 18bd4c756e2af5..52bae82d017f03 100644 --- a/net/test/embedded_test_server/embedded_test_server_unittest.cc +++ b/net/test/embedded_test_server/embedded_test_server_unittest.cc @@ -412,7 +412,7 @@ class CancelRequestDelegate : public TestDelegate { class InfiniteResponse : public BasicHttpResponse { public: - InfiniteResponse() : weak_ptr_factory_(this) {} + InfiniteResponse() {} void SendResponse(const SendBytesCallback& send, const SendCompleteCallback& done) override { @@ -430,7 +430,7 @@ class InfiniteResponse : public BasicHttpResponse { weak_ptr_factory_.GetWeakPtr(), send))); } - base::WeakPtrFactory weak_ptr_factory_; + base::WeakPtrFactory weak_ptr_factory_{this}; DISALLOW_COPY_AND_ASSIGN(InfiniteResponse); }; diff --git a/net/test/embedded_test_server/http_connection.cc b/net/test/embedded_test_server/http_connection.cc index 8d30091f4515dc..9318607519b554 100644 --- a/net/test/embedded_test_server/http_connection.cc +++ b/net/test/embedded_test_server/http_connection.cc @@ -18,8 +18,7 @@ HttpConnection::HttpConnection(std::unique_ptr socket, const HandleRequestCallback& callback) : socket_(std::move(socket)), callback_(callback), - read_buf_(base::MakeRefCounted(4096)), - weak_factory_(this) {} + read_buf_(base::MakeRefCounted(4096)) {} HttpConnection::~HttpConnection() { weak_factory_.InvalidateWeakPtrs(); diff --git a/net/test/embedded_test_server/http_connection.h b/net/test/embedded_test_server/http_connection.h index bbf03984695111..041cea53028386 100644 --- a/net/test/embedded_test_server/http_connection.h +++ b/net/test/embedded_test_server/http_connection.h @@ -66,7 +66,7 @@ class HttpConnection { HttpRequestParser request_parser_; scoped_refptr read_buf_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(HttpConnection); }; diff --git a/net/test/tcp_socket_proxy.cc b/net/test/tcp_socket_proxy.cc index b7d79064d5a290..22584a93aadfdd 100644 --- a/net/test/tcp_socket_proxy.cc +++ b/net/test/tcp_socket_proxy.cc @@ -134,13 +134,13 @@ class ConnectionProxy { THREAD_CHECKER(thread_checker_); - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(ConnectionProxy); }; ConnectionProxy::ConnectionProxy(std::unique_ptr local_socket) - : local_socket_(std::move(local_socket)), weak_factory_(this) {} + : local_socket_(std::move(local_socket)) {} ConnectionProxy::~ConnectionProxy() { DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); diff --git a/net/test/url_request/ssl_certificate_error_job.cc b/net/test/url_request/ssl_certificate_error_job.cc index f7bcf66f60efbd..5044c7495c6ff8 100644 --- a/net/test/url_request/ssl_certificate_error_job.cc +++ b/net/test/url_request/ssl_certificate_error_job.cc @@ -42,8 +42,7 @@ class MockJobInterceptor : public URLRequestInterceptor { SSLCertificateErrorJob::SSLCertificateErrorJob( URLRequest* request, NetworkDelegate* network_delegate) - : URLRequestJob(request, network_delegate), weak_factory_(this) { -} + : URLRequestJob(request, network_delegate) {} void SSLCertificateErrorJob::Start() { base::ThreadTaskRunnerHandle::Get()->PostTask( diff --git a/net/test/url_request/ssl_certificate_error_job.h b/net/test/url_request/ssl_certificate_error_job.h index b3b372e8b004c9..7a2c86f73c935b 100644 --- a/net/test/url_request/ssl_certificate_error_job.h +++ b/net/test/url_request/ssl_certificate_error_job.h @@ -34,7 +34,7 @@ class SSLCertificateErrorJob : public URLRequestJob { void NotifyError(); - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(SSLCertificateErrorJob); }; diff --git a/net/test/url_request/url_request_failed_job.cc b/net/test/url_request/url_request_failed_job.cc index a893f72a943431..3000861692707a 100644 --- a/net/test/url_request/url_request_failed_job.cc +++ b/net/test/url_request/url_request_failed_job.cc @@ -84,8 +84,7 @@ URLRequestFailedJob::URLRequestFailedJob(URLRequest* request, : URLRequestJob(request, network_delegate), phase_(phase), net_error_(net_error), - total_received_bytes_(0), - weak_factory_(this) { + total_received_bytes_(0) { CHECK_GE(phase, URLRequestFailedJob::FailurePhase::START); CHECK_LE(phase, URLRequestFailedJob::FailurePhase::READ_ASYNC); CHECK_LT(net_error, OK); diff --git a/net/test/url_request/url_request_failed_job.h b/net/test/url_request/url_request_failed_job.h index 1e2695c2983f6f..8ce4763f6cba20 100644 --- a/net/test/url_request/url_request_failed_job.h +++ b/net/test/url_request/url_request_failed_job.h @@ -81,7 +81,7 @@ class URLRequestFailedJob : public URLRequestJob { const int net_error_; int64_t total_received_bytes_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(URLRequestFailedJob); }; diff --git a/net/test/url_request/url_request_hanging_read_job.cc b/net/test/url_request/url_request_hanging_read_job.cc index 2cae64e308c666..df9bf4485a49af 100644 --- a/net/test/url_request/url_request_hanging_read_job.cc +++ b/net/test/url_request/url_request_hanging_read_job.cc @@ -47,8 +47,8 @@ URLRequestHangingReadJob::URLRequestHangingReadJob( URLRequest* request, NetworkDelegate* network_delegate) : URLRequestJob(request, network_delegate), - content_length_(10), // non-zero content-length - weak_factory_(this) {} + content_length_(10) // non-zero content-length +{} void URLRequestHangingReadJob::Start() { // Start reading asynchronously so that all error reporting and data diff --git a/net/test/url_request/url_request_hanging_read_job.h b/net/test/url_request/url_request_hanging_read_job.h index 83ac941e8e43ea..bd4a4a78542d14 100644 --- a/net/test/url_request/url_request_hanging_read_job.h +++ b/net/test/url_request/url_request_hanging_read_job.h @@ -36,7 +36,7 @@ class URLRequestHangingReadJob : public URLRequestJob { void StartAsync(); const int content_length_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(URLRequestHangingReadJob); }; diff --git a/net/test/url_request/url_request_mock_data_job.cc b/net/test/url_request/url_request_mock_data_job.cc index 71a10f7694180c..59e69f969a10fe 100644 --- a/net/test/url_request/url_request_mock_data_job.cc +++ b/net/test/url_request/url_request_mock_data_job.cc @@ -101,8 +101,7 @@ URLRequestMockDataJob::URLRequestMockDataJob(URLRequest* request, bool request_client_certificate) : URLRequestJob(request, network_delegate), data_offset_(0), - request_client_certificate_(request_client_certificate), - weak_factory_(this) { + request_client_certificate_(request_client_certificate) { DCHECK_GT(data_repeat_count, 0); for (int i = 0; i < data_repeat_count; ++i) { data_.append(data); diff --git a/net/test/url_request/url_request_mock_data_job.h b/net/test/url_request/url_request_mock_data_job.h index cd70f2ae6ba6c2..1e183699872064 100644 --- a/net/test/url_request/url_request_mock_data_job.h +++ b/net/test/url_request/url_request_mock_data_job.h @@ -73,7 +73,7 @@ class URLRequestMockDataJob : public URLRequestJob { std::string data_; size_t data_offset_; bool request_client_certificate_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; }; } // namespace net diff --git a/net/test/url_request/url_request_mock_http_job.cc b/net/test/url_request/url_request_mock_http_job.cc index 803480e2005a47..40495441551389 100644 --- a/net/test/url_request/url_request_mock_http_job.cc +++ b/net/test/url_request/url_request_mock_http_job.cc @@ -130,8 +130,7 @@ URLRequestMockHTTPJob::URLRequestMockHTTPJob(URLRequest* request, : URLRequestFileJob(request, network_delegate, file_path, - base::CreateTaskRunnerWithTraits({base::MayBlock()})), - weak_ptr_factory_(this) {} + base::CreateTaskRunnerWithTraits({base::MayBlock()})) {} URLRequestMockHTTPJob::~URLRequestMockHTTPJob() = default; diff --git a/net/test/url_request/url_request_mock_http_job.h b/net/test/url_request/url_request_mock_http_job.h index e0c4ce8ba7f1b3..9c35bf956107db 100644 --- a/net/test/url_request/url_request_mock_http_job.h +++ b/net/test/url_request/url_request_mock_http_job.h @@ -77,7 +77,7 @@ class URLRequestMockHTTPJob : public URLRequestFileJob { std::string raw_headers_; int64_t total_received_bytes_ = 0; - base::WeakPtrFactory weak_ptr_factory_; + base::WeakPtrFactory weak_ptr_factory_{this}; DISALLOW_COPY_AND_ASSIGN(URLRequestMockHTTPJob); }; diff --git a/net/test/url_request/url_request_slow_download_job.cc b/net/test/url_request/url_request_slow_download_job.cc index 3b5437364fecde..2195db86e6f223 100644 --- a/net/test/url_request/url_request_slow_download_job.cc +++ b/net/test/url_request/url_request_slow_download_job.cc @@ -115,9 +115,7 @@ URLRequestSlowDownloadJob::URLRequestSlowDownloadJob( bytes_already_sent_(0), should_error_download_(false), should_finish_download_(false), - buffer_size_(0), - weak_factory_(this) { -} + buffer_size_(0) {} void URLRequestSlowDownloadJob::StartAsync() { if (base::LowerCaseEqualsASCII(kFinishDownloadUrl, diff --git a/net/test/url_request/url_request_slow_download_job.h b/net/test/url_request/url_request_slow_download_job.h index d90acb2f4d5870..c7302c9074cc6f 100644 --- a/net/test/url_request/url_request_slow_download_job.h +++ b/net/test/url_request/url_request_slow_download_job.h @@ -94,7 +94,7 @@ class URLRequestSlowDownloadJob : public URLRequestJob { scoped_refptr buffer_; int buffer_size_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; }; } // namespace net diff --git a/net/tools/quic/quic_http_proxy_backend_stream.cc b/net/tools/quic/quic_http_proxy_backend_stream.cc index cdd598cc294f49..9c05123393857b 100644 --- a/net/tools/quic/quic_http_proxy_backend_stream.cc +++ b/net/tools/quic/quic_http_proxy_backend_stream.cc @@ -53,8 +53,7 @@ QuicHttpProxyBackendStream::QuicHttpProxyBackendStream( buf_(base::MakeRefCounted(kBufferSize)), response_completed_(false), headers_set_(false), - quic_response_(new quic::QuicBackendResponse()), - weak_factory_(this) {} + quic_response_(new quic::QuicBackendResponse()) {} QuicHttpProxyBackendStream::~QuicHttpProxyBackendStream() {} diff --git a/net/tools/quic/quic_http_proxy_backend_stream.h b/net/tools/quic/quic_http_proxy_backend_stream.h index e578c1aaf61a2f..6d87391eb8ad83 100644 --- a/net/tools/quic/quic_http_proxy_backend_stream.h +++ b/net/tools/quic/quic_http_proxy_backend_stream.h @@ -156,7 +156,7 @@ class QuicHttpProxyBackendStream : public net::URLRequest::Delegate { bool headers_set_; std::unique_ptr quic_response_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(QuicHttpProxyBackendStream); }; diff --git a/net/tools/quic/quic_simple_client.cc b/net/tools/quic/quic_simple_client.cc index f3a25e8d92ff6c..fb8651d1ffa4b1 100644 --- a/net/tools/quic/quic_simple_client.cc +++ b/net/tools/quic/quic_simple_client.cc @@ -47,8 +47,7 @@ QuicSimpleClient::QuicSimpleClient( quic::QuicWrapUnique( new QuicClientMessageLooplNetworkHelper(&clock_, this)), std::move(proof_verifier)), - initialized_(false), - weak_factory_(this) { + initialized_(false) { set_server_address(server_address); } diff --git a/net/tools/quic/quic_simple_client.h b/net/tools/quic/quic_simple_client.h index 2c682a5c7ec337..add25ad7f0c6dd 100644 --- a/net/tools/quic/quic_simple_client.h +++ b/net/tools/quic/quic_simple_client.h @@ -57,7 +57,7 @@ class QuicSimpleClient : public quic::QuicSpdyClientBase { // Tracks if the client is initialized to connect. bool initialized_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(QuicSimpleClient); }; diff --git a/net/tools/quic/quic_simple_server.cc b/net/tools/quic/quic_simple_server.cc index 2349d45989f9f2..a4f09f72c443d7 100644 --- a/net/tools/quic/quic_simple_server.cc +++ b/net/tools/quic/quic_simple_server.cc @@ -59,8 +59,7 @@ QuicSimpleServer::QuicSimpleServer( read_pending_(false), synchronous_read_count_(0), read_buffer_(base::MakeRefCounted(kReadBufferSize)), - quic_simple_server_backend_(quic_simple_server_backend), - weak_factory_(this) { + quic_simple_server_backend_(quic_simple_server_backend) { DCHECK(quic_simple_server_backend); Initialize(); } diff --git a/net/tools/quic/quic_simple_server.h b/net/tools/quic/quic_simple_server.h index 743b8838afd2a5..6d7c36cf8d2789 100644 --- a/net/tools/quic/quic_simple_server.h +++ b/net/tools/quic/quic_simple_server.h @@ -119,7 +119,7 @@ class QuicSimpleServer { quic::QuicSimpleServerBackend* quic_simple_server_backend_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(QuicSimpleServer); }; diff --git a/net/tools/quic/quic_simple_server_packet_writer.cc b/net/tools/quic/quic_simple_server_packet_writer.cc index 6e71a9d8cce30f..10730abc6d1fe0 100644 --- a/net/tools/quic/quic_simple_server_packet_writer.cc +++ b/net/tools/quic/quic_simple_server_packet_writer.cc @@ -21,10 +21,7 @@ namespace net { QuicSimpleServerPacketWriter::QuicSimpleServerPacketWriter( UDPServerSocket* socket, quic::QuicDispatcher* dispatcher) - : socket_(socket), - dispatcher_(dispatcher), - write_blocked_(false), - weak_factory_(this) {} + : socket_(socket), dispatcher_(dispatcher), write_blocked_(false) {} QuicSimpleServerPacketWriter::~QuicSimpleServerPacketWriter() = default; diff --git a/net/tools/quic/quic_simple_server_packet_writer.h b/net/tools/quic/quic_simple_server_packet_writer.h index 967eda87ce46f5..76f8b8e82f9b1f 100644 --- a/net/tools/quic/quic_simple_server_packet_writer.h +++ b/net/tools/quic/quic_simple_server_packet_writer.h @@ -67,7 +67,7 @@ class QuicSimpleServerPacketWriter : public quic::QuicPacketWriter { // Whether a write is currently in flight. bool write_blocked_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(QuicSimpleServerPacketWriter); }; diff --git a/net/url_request/test_url_fetcher_factory.cc b/net/url_request/test_url_fetcher_factory.cc index 7528b22cea86ec..5a77624235509d 100644 --- a/net/url_request/test_url_fetcher_factory.cc +++ b/net/url_request/test_url_fetcher_factory.cc @@ -359,8 +359,7 @@ FakeURLFetcher::FakeURLFetcher(const GURL& url, const std::string& response_data, HttpStatusCode response_code, URLRequestStatus::Status status) - : TestURLFetcher(0, url, d), - weak_factory_(this) { + : TestURLFetcher(0, url, d) { Error error = OK; switch(status) { case URLRequestStatus::SUCCESS: diff --git a/net/url_request/test_url_fetcher_factory.h b/net/url_request/test_url_fetcher_factory.h index cbd0cde8a8877e..2bf8b6f3947d57 100644 --- a/net/url_request/test_url_fetcher_factory.h +++ b/net/url_request/test_url_fetcher_factory.h @@ -326,7 +326,7 @@ class FakeURLFetcher : public TestURLFetcher { void RunDelegate(); int64_t response_bytes_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(FakeURLFetcher); }; diff --git a/net/url_request/url_fetcher_response_writer.cc b/net/url_request/url_fetcher_response_writer.cc index e4237b9a3e22aa..acc75639ed7f9d 100644 --- a/net/url_request/url_fetcher_response_writer.cc +++ b/net/url_request/url_fetcher_response_writer.cc @@ -56,8 +56,7 @@ URLFetcherFileWriter::URLFetcherFileWriter( const base::FilePath& file_path) : file_task_runner_(file_task_runner), file_path_(file_path), - owns_file_(false), - weak_factory_(this) { + owns_file_(false) { DCHECK(file_task_runner_.get()); } diff --git a/net/url_request/url_fetcher_response_writer.h b/net/url_request/url_fetcher_response_writer.h index 1415ba60b06a21..202cf637ed83ca 100644 --- a/net/url_request/url_fetcher_response_writer.h +++ b/net/url_request/url_fetcher_response_writer.h @@ -141,7 +141,7 @@ class NET_EXPORT URLFetcherFileWriter : public URLFetcherResponseWriter { CompletionOnceCallback callback_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(URLFetcherFileWriter); }; diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc index 974cd096bdc4b7..ea057ba78bfb68 100644 --- a/net/url_request/url_request.cc +++ b/net/url_request/url_request.cc @@ -616,8 +616,7 @@ URLRequest::URLRequest(const GURL& url, raw_header_size_(0), is_pac_request_(false), traffic_annotation_(traffic_annotation), - upgrade_if_insecure_(false), - weak_factory_(this) { + upgrade_if_insecure_(false) { // Sanity check out environment. DCHECK(base::ThreadTaskRunnerHandle::IsSet()); diff --git a/net/url_request/url_request.h b/net/url_request/url_request.h index 695fb9ae12662a..2a0950079cb9cf 100644 --- a/net/url_request/url_request.h +++ b/net/url_request/url_request.h @@ -1025,7 +1025,7 @@ class NET_EXPORT URLRequest : public base::SupportsUserData { THREAD_CHECKER(thread_checker_); - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(URLRequest); }; diff --git a/net/url_request/url_request_error_job.cc b/net/url_request/url_request_error_job.cc index 0eda199ab0c5b6..aba7e5783bd6c3 100644 --- a/net/url_request/url_request_error_job.cc +++ b/net/url_request/url_request_error_job.cc @@ -14,11 +14,10 @@ namespace net { -URLRequestErrorJob::URLRequestErrorJob( - URLRequest* request, NetworkDelegate* network_delegate, int error) - : URLRequestJob(request, network_delegate), - error_(error), - weak_factory_(this) {} +URLRequestErrorJob::URLRequestErrorJob(URLRequest* request, + NetworkDelegate* network_delegate, + int error) + : URLRequestJob(request, network_delegate), error_(error) {} URLRequestErrorJob::~URLRequestErrorJob() = default; diff --git a/net/url_request/url_request_error_job.h b/net/url_request/url_request_error_job.h index efd6b6696e8e4f..2ce3f8df885cfe 100644 --- a/net/url_request/url_request_error_job.h +++ b/net/url_request/url_request_error_job.h @@ -30,7 +30,7 @@ class NET_EXPORT URLRequestErrorJob : public URLRequestJob { int error_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; }; } // namespace net diff --git a/net/url_request/url_request_file_dir_job.cc b/net/url_request/url_request_file_dir_job.cc index ca05b6c3f43a05..97d9384b0e2b55 100644 --- a/net/url_request/url_request_file_dir_job.cc +++ b/net/url_request/url_request_file_dir_job.cc @@ -36,8 +36,7 @@ URLRequestFileDirJob::URLRequestFileDirJob(URLRequest* request, list_complete_(false), wrote_header_(false), read_pending_(false), - read_buffer_length_(0), - weak_factory_(this) {} + read_buffer_length_(0) {} void URLRequestFileDirJob::StartAsync() { base::PostTaskWithTraitsAndReplyWithResult( diff --git a/net/url_request/url_request_file_dir_job.h b/net/url_request/url_request_file_dir_job.h index b0858ac976e3cf..4184f3c5b65324 100644 --- a/net/url_request/url_request_file_dir_job.h +++ b/net/url_request/url_request_file_dir_job.h @@ -75,7 +75,7 @@ class NET_EXPORT_PRIVATE URLRequestFileDirJob scoped_refptr read_buffer_; int read_buffer_length_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(URLRequestFileDirJob); }; diff --git a/net/url_request/url_request_file_job.cc b/net/url_request/url_request_file_job.cc index 78968032cbbfdb..955816bd263ce5 100644 --- a/net/url_request/url_request_file_job.cc +++ b/net/url_request/url_request_file_job.cc @@ -64,8 +64,7 @@ URLRequestFileJob::URLRequestFileJob( stream_(new FileStream(file_task_runner)), file_task_runner_(file_task_runner), remaining_bytes_(0), - range_parse_result_(OK), - weak_ptr_factory_(this) {} + range_parse_result_(OK) {} void URLRequestFileJob::Start() { FileMetaInfo* meta_info = new FileMetaInfo(); diff --git a/net/url_request/url_request_file_job.h b/net/url_request/url_request_file_job.h index d074eb5f4904ca..b41eda0c460231 100644 --- a/net/url_request/url_request_file_job.h +++ b/net/url_request/url_request_file_job.h @@ -132,7 +132,7 @@ class NET_EXPORT URLRequestFileJob : public URLRequestJob { Error range_parse_result_; - base::WeakPtrFactory weak_ptr_factory_; + base::WeakPtrFactory weak_ptr_factory_{this}; DISALLOW_COPY_AND_ASSIGN(URLRequestFileJob); }; diff --git a/net/url_request/url_request_ftp_job.cc b/net/url_request/url_request_ftp_job.cc index b136af5823e06e..85b36e227338ef 100644 --- a/net/url_request/url_request_ftp_job.cc +++ b/net/url_request/url_request_ftp_job.cc @@ -50,8 +50,7 @@ URLRequestFtpJob::URLRequestFtpJob( request_->context()->proxy_resolution_service()), read_in_progress_(false), ftp_transaction_factory_(ftp_transaction_factory), - ftp_auth_cache_(ftp_auth_cache), - weak_factory_(this) { + ftp_auth_cache_(ftp_auth_cache) { DCHECK(proxy_resolution_service_); DCHECK(ftp_transaction_factory); DCHECK(ftp_auth_cache); diff --git a/net/url_request/url_request_ftp_job.h b/net/url_request/url_request_ftp_job.h index 7d0648ebda7c7d..a8dd912134aa41 100644 --- a/net/url_request/url_request_ftp_job.h +++ b/net/url_request/url_request_ftp_job.h @@ -93,7 +93,7 @@ class NET_EXPORT_PRIVATE URLRequestFtpJob : public URLRequestJob { FtpTransactionFactory* ftp_transaction_factory_; FtpAuthCache* ftp_auth_cache_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(URLRequestFtpJob); }; diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc index 90be1efdfedeba..9981b87b35067a 100644 --- a/net/url_request/url_request_http_job.cc +++ b/net/url_request/url_request_http_job.cc @@ -292,8 +292,7 @@ URLRequestHttpJob::URLRequestHttpJob( awaiting_callback_(false), http_user_agent_settings_(http_user_agent_settings), total_received_bytes_from_previous_transactions_(0), - total_sent_bytes_from_previous_transactions_(0), - weak_factory_(this) { + total_sent_bytes_from_previous_transactions_(0) { URLRequestThrottlerManager* manager = request->context()->throttler_manager(); if (manager) throttling_entry_ = manager->RegisterRequestUrl(request->url()); diff --git a/net/url_request/url_request_http_job.h b/net/url_request/url_request_http_job.h index b02453a3e3acf4..0162bfbf60b78d 100644 --- a/net/url_request/url_request_http_job.h +++ b/net/url_request/url_request_http_job.h @@ -255,7 +255,7 @@ class NET_EXPORT_PRIVATE URLRequestHttpJob : public URLRequestJob { RequestHeadersCallback request_headers_callback_; ResponseHeadersCallback response_headers_callback_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(URLRequestHttpJob); }; diff --git a/net/url_request/url_request_job.cc b/net/url_request/url_request_job.cc index 18d56f1e5b1d3e..4cc5bb49308978 100644 --- a/net/url_request/url_request_job.cc +++ b/net/url_request/url_request_job.cc @@ -87,9 +87,7 @@ URLRequestJob::URLRequestJob(URLRequest* request, expected_content_size_(-1), network_delegate_(network_delegate), last_notified_total_received_bytes_(0), - last_notified_total_sent_bytes_(0), - weak_factory_(this) { -} + last_notified_total_sent_bytes_(0) {} URLRequestJob::~URLRequestJob() { } diff --git a/net/url_request/url_request_job.h b/net/url_request/url_request_job.h index df3eda2f766121..c24ee2ec6099f1 100644 --- a/net/url_request/url_request_job.h +++ b/net/url_request/url_request_job.h @@ -462,7 +462,7 @@ class NET_EXPORT URLRequestJob { // completed. CompletionOnceCallback read_raw_callback_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(URLRequestJob); }; diff --git a/net/url_request/url_request_job_factory_impl_unittest.cc b/net/url_request/url_request_job_factory_impl_unittest.cc index 7f887ea5372c9f..55664cf79f93aa 100644 --- a/net/url_request/url_request_job_factory_impl_unittest.cc +++ b/net/url_request/url_request_job_factory_impl_unittest.cc @@ -30,7 +30,7 @@ namespace { class MockURLRequestJob : public URLRequestJob { public: MockURLRequestJob(URLRequest* request, NetworkDelegate* network_delegate) - : URLRequestJob(request, network_delegate), weak_factory_(this) {} + : URLRequestJob(request, network_delegate) {} void Start() override { // Start reading asynchronously so that all error reporting and data @@ -48,7 +48,7 @@ class MockURLRequestJob : public URLRequestJob { NotifyHeadersComplete(); } - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; }; class DummyProtocolHandler : public URLRequestJobFactory::ProtocolHandler { diff --git a/net/url_request/url_request_redirect_job.cc b/net/url_request/url_request_redirect_job.cc index 028d0b6f1a93bb..13778fdd53631e 100644 --- a/net/url_request/url_request_redirect_job.cc +++ b/net/url_request/url_request_redirect_job.cc @@ -33,8 +33,7 @@ URLRequestRedirectJob::URLRequestRedirectJob(URLRequest* request, : URLRequestJob(request, network_delegate), redirect_destination_(redirect_destination), response_code_(response_code), - redirect_reason_(redirect_reason), - weak_factory_(this) { + redirect_reason_(redirect_reason) { DCHECK(!redirect_reason_.empty()); } diff --git a/net/url_request/url_request_redirect_job.h b/net/url_request/url_request_redirect_job.h index 097ffa88824553..8d7b861bbf81d4 100644 --- a/net/url_request/url_request_redirect_job.h +++ b/net/url_request/url_request_redirect_job.h @@ -61,7 +61,7 @@ class NET_EXPORT URLRequestRedirectJob : public URLRequestJob { scoped_refptr fake_headers_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; }; } // namespace net diff --git a/net/url_request/url_request_simple_job.cc b/net/url_request/url_request_simple_job.cc index 6b5b5851373f8e..c514128a861fc8 100644 --- a/net/url_request/url_request_simple_job.cc +++ b/net/url_request/url_request_simple_job.cc @@ -35,10 +35,7 @@ void CopyData(const scoped_refptr& buf, URLRequestSimpleJob::URLRequestSimpleJob(URLRequest* request, NetworkDelegate* network_delegate) - : URLRangeRequestJob(request, network_delegate), - next_data_offset_(0), - weak_factory_(this) { -} + : URLRangeRequestJob(request, network_delegate), next_data_offset_(0) {} void URLRequestSimpleJob::Start() { // Start reading asynchronously so that all error reporting and data diff --git a/net/url_request/url_request_simple_job.h b/net/url_request/url_request_simple_job.h index a27e819890833c..18ead7d10f406f 100644 --- a/net/url_request/url_request_simple_job.h +++ b/net/url_request/url_request_simple_job.h @@ -70,7 +70,7 @@ class NET_EXPORT URLRequestSimpleJob : public URLRangeRequestJob { std::string charset_; scoped_refptr data_; int64_t next_data_offset_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; }; } // namespace net diff --git a/net/url_request/url_request_test_job.cc b/net/url_request/url_request_test_job.cc index da2b8d61ef78d7..45861e5386dc58 100644 --- a/net/url_request/url_request_test_job.cc +++ b/net/url_request/url_request_test_job.cc @@ -157,8 +157,7 @@ URLRequestTestJob::URLRequestTestJob(URLRequest* request, async_buf_(nullptr), async_buf_size_(0), response_headers_length_(0), - async_reads_(false), - weak_factory_(this) {} + async_reads_(false) {} URLRequestTestJob::URLRequestTestJob(URLRequest* request, NetworkDelegate* network_delegate, @@ -176,8 +175,7 @@ URLRequestTestJob::URLRequestTestJob(URLRequest* request, response_headers_(base::MakeRefCounted( net::HttpUtil::AssembleRawHeaders(response_headers))), response_headers_length_(response_headers.size()), - async_reads_(false), - weak_factory_(this) {} + async_reads_(false) {} URLRequestTestJob::~URLRequestTestJob() { base::Erase(g_pending_jobs.Get(), this); diff --git a/net/url_request/url_request_test_job.h b/net/url_request/url_request_test_job.h index 88df017b3d1718..59e91cc61c6fbb 100644 --- a/net/url_request/url_request_test_job.h +++ b/net/url_request/url_request_test_job.h @@ -200,7 +200,7 @@ class NET_EXPORT_PRIVATE URLRequestTestJob : public URLRequestJob { bool async_reads_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; }; } // namespace net diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc index 50599f616f00b9..74d7bb226c4af9 100644 --- a/net/url_request/url_request_unittest.cc +++ b/net/url_request/url_request_unittest.cc @@ -537,7 +537,7 @@ class BlockingNetworkDelegate : public TestNetworkDelegate { // Closure to run to exit RunUntilBlocked(). base::OnceClosure on_blocked_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(BlockingNetworkDelegate); }; @@ -548,8 +548,7 @@ BlockingNetworkDelegate::BlockingNetworkDelegate(BlockMode block_mode) auth_retval_(AUTH_REQUIRED_RESPONSE_NO_ACTION), block_on_(0), target_auth_credentials_(nullptr), - stage_blocked_for_callback_(NOT_BLOCKED), - weak_factory_(this) {} + stage_blocked_for_callback_(NOT_BLOCKED) {} void BlockingNetworkDelegate::RunUntilBlocked() { base::RunLoop run_loop; diff --git a/net/websockets/websocket_basic_handshake_stream.cc b/net/websockets/websocket_basic_handshake_stream.cc index 88f8646932e117..3199a93dec5cca 100644 --- a/net/websockets/websocket_basic_handshake_stream.cc +++ b/net/websockets/websocket_basic_handshake_stream.cc @@ -179,8 +179,7 @@ WebSocketBasicHandshakeStream::WebSocketBasicHandshakeStream( requested_sub_protocols_(std::move(requested_sub_protocols)), requested_extensions_(std::move(requested_extensions)), stream_request_(request), - websocket_endpoint_lock_manager_(websocket_endpoint_lock_manager), - weak_ptr_factory_(this) { + websocket_endpoint_lock_manager_(websocket_endpoint_lock_manager) { DCHECK(connect_delegate); DCHECK(request); } diff --git a/net/websockets/websocket_basic_handshake_stream.h b/net/websockets/websocket_basic_handshake_stream.h index 69e14b8b28e5a8..31986aa653f131 100644 --- a/net/websockets/websocket_basic_handshake_stream.h +++ b/net/websockets/websocket_basic_handshake_stream.h @@ -149,7 +149,7 @@ class NET_EXPORT_PRIVATE WebSocketBasicHandshakeStream final WebSocketEndpointLockManager* const websocket_endpoint_lock_manager_; - base::WeakPtrFactory weak_ptr_factory_; + base::WeakPtrFactory weak_ptr_factory_{this}; DISALLOW_COPY_AND_ASSIGN(WebSocketBasicHandshakeStream); }; diff --git a/net/websockets/websocket_basic_stream_adapters.cc b/net/websockets/websocket_basic_stream_adapters.cc index 7bdf9dbbd2d7d6..789804f0eb77f7 100644 --- a/net/websockets/websocket_basic_stream_adapters.cc +++ b/net/websockets/websocket_basic_stream_adapters.cc @@ -57,8 +57,7 @@ WebSocketSpdyStreamAdapter::WebSocketSpdyStreamAdapter( stream_error_(ERR_CONNECTION_CLOSED), delegate_(delegate), write_length_(0), - net_log_(net_log), - weak_factory_(this) { + net_log_(net_log) { stream_->SetDelegate(this); } diff --git a/net/websockets/websocket_basic_stream_adapters.h b/net/websockets/websocket_basic_stream_adapters.h index 350a7224475876..6c2ee1f3b1f919 100644 --- a/net/websockets/websocket_basic_stream_adapters.h +++ b/net/websockets/websocket_basic_stream_adapters.h @@ -144,7 +144,7 @@ class NET_EXPORT_PRIVATE WebSocketSpdyStreamAdapter NetLogWithSource net_log_; - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_{this}; }; } // namespace net diff --git a/net/websockets/websocket_channel_test.cc b/net/websockets/websocket_channel_test.cc index a55e266f2df705..cb83f9c021bdae 100644 --- a/net/websockets/websocket_channel_test.cc +++ b/net/websockets/websocket_channel_test.cc @@ -660,7 +660,7 @@ class EchoeyFakeWebSocketStream : public FakeWebSocketStream { // 2. Calling either callback may delete the stream altogether. class ResetOnWriteFakeWebSocketStream : public FakeWebSocketStream { public: - ResetOnWriteFakeWebSocketStream() : closed_(false), weak_ptr_factory_(this) {} + ResetOnWriteFakeWebSocketStream() : closed_(false) {} int WriteFrames(std::vector>* frames, CompletionOnceCallback callback) override { @@ -697,7 +697,7 @@ class ResetOnWriteFakeWebSocketStream : public FakeWebSocketStream { bool closed_; // An IO error can result in the socket being deleted, so we use weak pointers // to ensure correct behaviour in that case. - base::WeakPtrFactory weak_ptr_factory_; + base::WeakPtrFactory weak_ptr_factory_{this}; }; // This mock is for verifying that WebSocket protocol semantics are obeyed (to diff --git a/net/websockets/websocket_http2_handshake_stream.cc b/net/websockets/websocket_http2_handshake_stream.cc index ecd4ecced5a6cb..99910c99b8d260 100644 --- a/net/websockets/websocket_http2_handshake_stream.cc +++ b/net/websockets/websocket_http2_handshake_stream.cc @@ -53,8 +53,7 @@ WebSocketHttp2HandshakeStream::WebSocketHttp2HandshakeStream( request_info_(nullptr), stream_closed_(false), stream_error_(OK), - response_headers_complete_(false), - weak_ptr_factory_(this) { + response_headers_complete_(false) { DCHECK(connect_delegate); DCHECK(request); } diff --git a/net/websockets/websocket_http2_handshake_stream.h b/net/websockets/websocket_http2_handshake_stream.h index af734454cec46e..23ab9d2cd9cefc 100644 --- a/net/websockets/websocket_http2_handshake_stream.h +++ b/net/websockets/websocket_http2_handshake_stream.h @@ -177,7 +177,7 @@ class NET_EXPORT_PRIVATE WebSocketHttp2HandshakeStream // to avoid including extension-related header files here. std::unique_ptr extension_params_; - base::WeakPtrFactory weak_ptr_factory_; + base::WeakPtrFactory weak_ptr_factory_{this}; DISALLOW_COPY_AND_ASSIGN(WebSocketHttp2HandshakeStream); };