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 <[email protected]>
Commit-Queue: Jeremy Roman <[email protected]>
Cr-Commit-Position: refs/heads/master@{#675307}
diff --git a/net/base/chunked_upload_data_stream.cc b/net/base/chunked_upload_data_stream.cc
index f7e2a66..f4db7d7 100644
--- a/net/base/chunked_upload_data_stream.cc
+++ b/net/base/chunked_upload_data_stream.cc
@@ -31,8 +31,7 @@
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 65da00d..50f644f 100644
--- a/net/base/chunked_upload_data_stream.h
+++ b/net/base/chunked_upload_data_stream.h
@@ -98,7 +98,7 @@
scoped_refptr<IOBuffer> read_buffer_;
int read_buffer_len_;
- base::WeakPtrFactory<ChunkedUploadDataStream> weak_factory_;
+ base::WeakPtrFactory<ChunkedUploadDataStream> 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 9465b746..5cc6590 100644
--- a/net/base/elements_upload_data_stream.cc
+++ b/net/base/elements_upload_data_stream.cc
@@ -19,8 +19,7 @@
: 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 4ad4048..ba8f9457 100644
--- a/net/base/elements_upload_data_stream.h
+++ b/net/base/elements_upload_data_stream.h
@@ -80,7 +80,7 @@
// Set to actual error if read fails, otherwise set to net::OK.
int read_error_;
- base::WeakPtrFactory<ElementsUploadDataStream> weak_ptr_factory_;
+ base::WeakPtrFactory<ElementsUploadDataStream> 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 4cff945..64104ee 100644
--- a/net/base/mock_file_stream.cc
+++ b/net/base/mock_file_stream.cc
@@ -20,9 +20,7 @@
: 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 @@
: 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 9f1eb98..fba7843 100644
--- a/net/base/mock_file_stream.h
+++ b/net/base/mock_file_stream.h
@@ -98,7 +98,7 @@
base::OnceClosure throttled_task_;
base::FilePath path_;
- base::WeakPtrFactory<MockFileStream> weak_factory_;
+ base::WeakPtrFactory<MockFileStream> weak_factory_{this};
};
} // namespace testing
diff --git a/net/base/upload_file_element_reader.cc b/net/base/upload_file_element_reader.cc
index adf4e74..b3936000 100644
--- a/net/base/upload_file_element_reader.cc
+++ b/net/base/upload_file_element_reader.cc
@@ -38,8 +38,7 @@
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<FileStream>(std::move(file), task_runner);
@@ -59,8 +58,7 @@
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 190bbc4..706137af 100644
--- a/net/base/upload_file_element_reader.h
+++ b/net/base/upload_file_element_reader.h
@@ -129,7 +129,7 @@
// True if Init() was called while an async operation was in progress.
bool init_called_while_operation_pending_;
- base::WeakPtrFactory<UploadFileElementReader> weak_ptr_factory_;
+ base::WeakPtrFactory<UploadFileElementReader> 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 3a5161f..e65dadb 100644
--- a/net/cert/mock_cert_verifier.cc
+++ b/net/cert/mock_cert_verifier.cc
@@ -43,7 +43,7 @@
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 @@
CertVerifyResult* result_;
CompletionOnceCallback callback_;
- base::WeakPtrFactory<MockRequest> weak_factory_;
+ base::WeakPtrFactory<MockRequest> weak_factory_{this};
};
MockCertVerifier::MockCertVerifier()
diff --git a/net/cert/multi_threaded_cert_verifier.cc b/net/cert/multi_threaded_cert_verifier.cc
index 531aa0e..e2c6013 100644
--- a/net/cert/multi_threaded_cert_verifier.cc
+++ b/net/cert/multi_threaded_cert_verifier.cc
@@ -221,8 +221,7 @@
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 @@
MultiThreadedCertVerifier* cert_verifier_; // Non-owned.
bool is_first_job_;
- base::WeakPtrFactory<CertVerifierJob> weak_ptr_factory_;
+ base::WeakPtrFactory<CertVerifierJob> weak_ptr_factory_{this};
};
MultiThreadedCertVerifier::MultiThreadedCertVerifier(
diff --git a/net/cert/nss_cert_database.cc b/net/cert/nss_cert_database.cc
index bc966fbe..56dd127 100644
--- a/net/cert/nss_cert_database.cc
+++ b/net/cert/nss_cert_database.cc
@@ -70,8 +70,7 @@
crypto::ScopedPK11Slot private_slot)
: public_slot_(std::move(public_slot)),
private_slot_(std::move(private_slot)),
- observer_list_(new base::ObserverListThreadSafe<Observer>),
- weak_factory_(this) {
+ observer_list_(new base::ObserverListThreadSafe<Observer>) {
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 cee2f01..97be8c4 100644
--- a/net/cert/nss_cert_database.h
+++ b/net/cert/nss_cert_database.h
@@ -282,7 +282,7 @@
const scoped_refptr<base::ObserverListThreadSafe<Observer>> observer_list_;
- base::WeakPtrFactory<NSSCertDatabase> weak_factory_;
+ base::WeakPtrFactory<NSSCertDatabase> weak_factory_{this};
DISALLOW_COPY_AND_ASSIGN(NSSCertDatabase);
};
diff --git a/net/cookies/cookie_monster.cc b/net/cookies/cookie_monster.cc
index a13fb0f..909d5aa 100644
--- a/net/cookies/cookie_monster.cc
+++ b/net/cookies/cookie_monster.cc
@@ -355,8 +355,7 @@
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 85ca69f..913737e 100644
--- a/net/cookies/cookie_monster.h
+++ b/net/cookies/cookie_monster.h
@@ -623,7 +623,7 @@
base::ThreadChecker thread_checker_;
- base::WeakPtrFactory<CookieMonster> weak_ptr_factory_;
+ base::WeakPtrFactory<CookieMonster> 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 39ccf3b..7d09ea4 100644
--- a/net/cookies/cookie_monster_change_dispatcher.cc
+++ b/net/cookies/cookie_monster_change_dispatcher.cc
@@ -35,8 +35,7 @@
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 @@
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 caf35e8..b1d7c51 100644
--- a/net/cookies/cookie_monster_change_dispatcher.h
+++ b/net/cookies/cookie_monster_change_dispatcher.h
@@ -105,7 +105,7 @@
// Used to cancel delayed calls to DoDispatchChange() when the subscription
// gets destroyed.
- base::WeakPtrFactory<Subscription> weak_ptr_factory_;
+ base::WeakPtrFactory<Subscription> weak_ptr_factory_{this};
DISALLOW_COPY_AND_ASSIGN(Subscription);
};
@@ -149,7 +149,7 @@
THREAD_CHECKER(thread_checker_);
// Vends weak pointers to subscriptions.
- base::WeakPtrFactory<CookieMonsterChangeDispatcher> weak_ptr_factory_;
+ base::WeakPtrFactory<CookieMonsterChangeDispatcher> 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 8787a23..b231b7c 100644
--- a/net/disk_cache/blockfile/backend_impl.cc
+++ b/net/disk_cache/blockfile/backend_impl.cc
@@ -173,8 +173,7 @@
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 @@
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 99d28d7b..16a492ba 100644
--- a/net/disk_cache/blockfile/backend_impl.h
+++ b/net/disk_cache/blockfile/backend_impl.h
@@ -430,7 +430,7 @@
std::unique_ptr<base::RepeatingTimer> timer_; // Usage timer.
base::WaitableEvent done_; // Signals the end of background work.
scoped_refptr<TraceObject> trace_object_; // Initializes internal tracing.
- base::WeakPtrFactory<BackendImpl> ptr_factory_;
+ base::WeakPtrFactory<BackendImpl> 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 2608c7a..489f549 100644
--- a/net/disk_cache/blockfile/eviction.cc
+++ b/net/disk_cache/blockfile/eviction.cc
@@ -79,7 +79,7 @@
// 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 baea659..283463f 100644
--- a/net/disk_cache/blockfile/eviction.h
+++ b/net/disk_cache/blockfile/eviction.h
@@ -81,7 +81,7 @@
bool delay_trim_;
bool init_;
bool test_mode_;
- base::WeakPtrFactory<Eviction> ptr_factory_;
+ base::WeakPtrFactory<Eviction> 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 32895a5..c492295 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 @@
InFlightBackendIO::InFlightBackendIO(
BackendImpl* backend,
const scoped_refptr<base::SingleThreadTaskRunner>& 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 7d050219..724cc33 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 @@
void PostOperation(const base::Location& from_here, BackendIO* operation);
BackendImpl* backend_;
scoped_refptr<base::SingleThreadTaskRunner> background_thread_;
- base::WeakPtrFactory<InFlightBackendIO> ptr_factory_;
+ base::WeakPtrFactory<InFlightBackendIO> 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 a03c53d..bddd8858 100644
--- a/net/disk_cache/memory/mem_backend_impl.cc
+++ b/net/disk_cache/memory/mem_backend_impl.cc
@@ -63,8 +63,7 @@
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 f79ef3320..046fed2 100644
--- a/net/disk_cache/memory/mem_backend_impl.h
+++ b/net/disk_cache/memory/mem_backend_impl.h
@@ -149,7 +149,7 @@
base::MemoryPressureListener memory_pressure_listener_;
- base::WeakPtrFactory<MemBackendImpl> weak_factory_;
+ base::WeakPtrFactory<MemBackendImpl> 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 1b3a4fe..018d6ae 100644
--- a/net/disk_cache/simple/simple_backend_impl.cc
+++ b/net/disk_cache/simple/simple_backend_impl.cc
@@ -558,9 +558,7 @@
class SimpleBackendImpl::SimpleIterator final : public Iterator {
public:
explicit SimpleIterator(base::WeakPtr<SimpleBackendImpl> backend)
- : backend_(backend),
- weak_factory_(this) {
- }
+ : backend_(backend) {}
// From Backend::Iterator:
net::Error OpenNextEntry(Entry** next_entry,
@@ -624,7 +622,7 @@
private:
base::WeakPtr<SimpleBackendImpl> backend_;
std::unique_ptr<std::vector<uint64_t>> hashes_to_enumerate_;
- base::WeakPtrFactory<SimpleIterator> weak_factory_;
+ base::WeakPtrFactory<SimpleIterator> weak_factory_{this};
};
std::unique_ptr<Backend::Iterator> SimpleBackendImpl::CreateIterator() {
diff --git a/net/dns/dns_config_service_posix.cc b/net/dns/dns_config_service_posix.cc
index 21852fe..328cdd8 100644
--- a/net/dns/dns_config_service_posix.cc
+++ b/net/dns/dns_config_service_posix.cc
@@ -239,8 +239,7 @@
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 @@
base::FilePathWatcher hosts_watcher_;
#endif // !defined(OS_ANDROID) && !defined(OS_IOS)
- base::WeakPtrFactory<Watcher> weak_factory_;
+ base::WeakPtrFactory<Watcher> 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 eba9749..2138518 100644
--- a/net/dns/dns_socket_pool_unittest.cc
+++ b/net/dns/dns_socket_pool_unittest.cc
@@ -16,14 +16,14 @@
class DummyObject {
public:
- DummyObject() : weak_factory_(this) {}
+ DummyObject() {}
base::WeakPtr<DummyObject> GetWeakPtr() { return weak_factory_.GetWeakPtr(); }
bool HasWeakPtrs() const { return weak_factory_.HasWeakPtrs(); }
private:
- base::WeakPtrFactory<DummyObject> weak_factory_;
+ base::WeakPtrFactory<DummyObject> weak_factory_{this};
DISALLOW_COPY_AND_ASSIGN(DummyObject);
};
diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc
index 8bced98..4623473 100644
--- a/net/dns/dns_transaction.cc
+++ b/net/dns/dns_transaction.cc
@@ -329,9 +329,7 @@
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 @@
std::unique_ptr<URLRequest> request_;
NetLogWithSource net_log_;
- base::WeakPtrFactory<DnsHTTPAttempt> weak_factory_;
+ base::WeakPtrFactory<DnsHTTPAttempt> 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 7c01c64581..ec5f56e 100644
--- a/net/dns/dns_transaction_unittest.cc
+++ b/net/dns/dns_transaction_unittest.cc
@@ -418,8 +418,7 @@
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 @@
IOBuffer* pending_buf_;
int pending_buf_size_;
- base::WeakPtrFactory<URLRequestMockDohJob> weak_factory_;
+ base::WeakPtrFactory<URLRequestMockDohJob> 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 b547c5a..c384abf 100644
--- a/net/dns/fuzzed_host_resolver_util.cc
+++ b/net/dns/fuzzed_host_resolver_util.cc
@@ -174,8 +174,7 @@
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 @@
const IPEndPoint local_address_;
const NetLogWithSource net_log_;
- base::WeakPtrFactory<FuzzedMdnsSocket> weak_factory_;
+ base::WeakPtrFactory<FuzzedMdnsSocket> weak_factory_{this};
};
class FuzzedMdnsSocketFactory : public MDnsSocketFactory {
diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc
index fc932a2..a9bc7ef7 100644
--- a/net/dns/host_resolver_manager.cc
+++ b/net/dns/host_resolver_manager.cc
@@ -807,8 +807,7 @@
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 @@
// 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<ProcTask> weak_ptr_factory_;
+ base::WeakPtrFactory<ProcTask> weak_ptr_factory_{this};
DISALLOW_COPY_AND_ASSIGN(ProcTask);
};
@@ -1522,8 +1521,7 @@
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 @@
// Iterator to |this| in the JobMap. |nullopt| if not owned by the JobMap.
base::Optional<JobMap::iterator> self_iterator_;
- base::WeakPtrFactory<Job> weak_ptr_factory_;
+ base::WeakPtrFactory<Job> weak_ptr_factory_{this};
};
//-----------------------------------------------------------------------------
@@ -2372,9 +2370,7 @@
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 428fead..8f904491 100644
--- a/net/dns/host_resolver_manager.h
+++ b/net/dns/host_resolver_manager.h
@@ -534,9 +534,9 @@
THREAD_CHECKER(thread_checker_);
- base::WeakPtrFactory<HostResolverManager> weak_ptr_factory_;
+ base::WeakPtrFactory<HostResolverManager> weak_ptr_factory_{this};
- base::WeakPtrFactory<HostResolverManager> probe_weak_ptr_factory_;
+ base::WeakPtrFactory<HostResolverManager> 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 cc5c364..356278b5 100644
--- a/net/dns/host_resolver_mdns_task.cc
+++ b/net/dns/host_resolver_mdns_task.cc
@@ -128,7 +128,7 @@
MDnsClient* mdns_client,
const std::string& hostname,
const std::vector<DnsQueryType>& 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 5a1c829..e0e408a 100644
--- a/net/dns/host_resolver_mdns_task.h
+++ b/net/dns/host_resolver_mdns_task.h
@@ -63,7 +63,7 @@
SEQUENCE_CHECKER(sequence_checker_);
- base::WeakPtrFactory<HostResolverMdnsTask> weak_ptr_factory_;
+ base::WeakPtrFactory<HostResolverMdnsTask> 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 4d3ce6c..9ac0592f 100644
--- a/net/dns/mdns_client_impl.cc
+++ b/net/dns/mdns_client_impl.cc
@@ -131,8 +131,7 @@
}
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 fd911dc..0efda0b 100644
--- a/net/dns/mdns_client_impl.h
+++ b/net/dns/mdns_client_impl.h
@@ -111,7 +111,7 @@
Delegate* delegate_;
- base::WeakPtrFactory<MDnsConnection> weak_ptr_factory_;
+ base::WeakPtrFactory<MDnsConnection> weak_ptr_factory_{this};
DISALLOW_COPY_AND_ASSIGN(MDnsConnection);
};
diff --git a/net/dns/serial_worker.cc b/net/dns/serial_worker.cc
index 520bd3a..f66abb1 100644
--- a/net/dns/serial_worker.cc
+++ b/net/dns/serial_worker.cc
@@ -15,8 +15,7 @@
SerialWorker::SerialWorker()
: base::RefCountedDeleteOnSequence<SerialWorker>(
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 b647b69..a16e846 100644
--- a/net/dns/serial_worker.h
+++ b/net/dns/serial_worker.h
@@ -76,7 +76,7 @@
State state_;
- base::WeakPtrFactory<SerialWorker> weak_factory_;
+ base::WeakPtrFactory<SerialWorker> 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 a75e24c..a865243 100644
--- a/net/dns/system_dns_config_change_notifier.cc
+++ b/net/dns/system_dns_config_change_notifier.cc
@@ -29,8 +29,7 @@
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 @@
SystemDnsConfigChangeNotifier::Observer* const observer_;
SEQUENCE_CHECKER(sequence_checker_);
- base::WeakPtrFactory<WrappedObserver> weak_ptr_factory_;
+ base::WeakPtrFactory<WrappedObserver> weak_ptr_factory_{this};
DISALLOW_COPY_AND_ASSIGN(WrappedObserver);
};
@@ -67,8 +66,7 @@
Core(scoped_refptr<base::SequencedTaskRunner> task_runner,
std::unique_ptr<DnsConfigService> 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 @@
scoped_refptr<base::SequencedTaskRunner> task_runner_;
SEQUENCE_CHECKER(sequence_checker_);
std::unique_ptr<DnsConfigService> dns_config_service_;
- base::WeakPtrFactory<Core> weak_ptr_factory_;
+ base::WeakPtrFactory<Core> 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 e0f6f15..f67e487c 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 @@
const base::FilePath& path,
const scoped_refptr<base::SequencedTaskRunner>& client_task_runner,
const scoped_refptr<base::SequencedTaskRunner>& 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 1a6a7fb..cbd8646 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 @@
const scoped_refptr<Backend> backend_;
- base::WeakPtrFactory<SQLitePersistentReportingAndNelStore> weak_factory_;
+ base::WeakPtrFactory<SQLitePersistentReportingAndNelStore> weak_factory_{
+ this};
DISALLOW_COPY_AND_ASSIGN(SQLitePersistentReportingAndNelStore);
};
diff --git a/net/http/bidirectional_stream.cc b/net/http/bidirectional_stream.cc
index 780b8e4..0e23845 100644
--- a/net/http/bidirectional_stream.cc
+++ b/net/http/bidirectional_stream.cc
@@ -86,8 +86,7 @@
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 d4f56f4b..4f0b4ab 100644
--- a/net/http/bidirectional_stream.h
+++ b/net/http/bidirectional_stream.h
@@ -263,7 +263,7 @@
// are received. Other fields are populated at different stages of the request
LoadTimingInfo load_timing_info_;
- base::WeakPtrFactory<BidirectionalStream> weak_factory_;
+ base::WeakPtrFactory<BidirectionalStream> 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 e2a7185..fcb9548 100644
--- a/net/http/broken_alternative_services.cc
+++ b/net/http/broken_alternative_services.cc
@@ -34,7 +34,7 @@
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 3d6690f2..2d93fb4 100644
--- a/net/http/broken_alternative_services.h
+++ b/net/http/broken_alternative_services.h
@@ -165,7 +165,7 @@
// services.
base::OneShotTimer expiration_timer_;
- base::WeakPtrFactory<BrokenAlternativeServices> weak_ptr_factory_;
+ base::WeakPtrFactory<BrokenAlternativeServices> 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 74d9fef..2f051ced 100644
--- a/net/http/http_auth_handler_mock.cc
+++ b/net/http/http_auth_handler_mock.cc
@@ -49,8 +49,7 @@
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 abc3693..5e7e32c8 100644
--- a/net/http/http_auth_handler_mock.h
+++ b/net/http/http_auth_handler_mock.h
@@ -111,7 +111,7 @@
bool allows_default_credentials_;
bool allows_explicit_credentials_;
GURL request_url_;
- base::WeakPtrFactory<HttpAuthHandlerMock> weak_factory_;
+ base::WeakPtrFactory<HttpAuthHandlerMock> 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 acd5cf8..dfea258 100644
--- a/net/http/http_cache.cc
+++ b/net/http/http_cache.cc
@@ -250,8 +250,7 @@
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 832a5dcc..c6422af 100644
--- a/net/http/http_cache.h
+++ b/net/http/http_cache.h
@@ -663,7 +663,7 @@
THREAD_CHECKER(thread_checker_);
- base::WeakPtrFactory<HttpCache> weak_factory_;
+ base::WeakPtrFactory<HttpCache> 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 db6240b..770552b 100644
--- a/net/http/http_cache_lookup_manager.cc
+++ b/net/http/http_cache_lookup_manager.cc
@@ -61,7 +61,7 @@
}
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 ba649cd..d7ece67 100644
--- a/net/http/http_cache_lookup_manager.h
+++ b/net/http/http_cache_lookup_manager.h
@@ -57,7 +57,7 @@
// HttpCache must outlive the HttpCacheLookupManager.
HttpCache* http_cache_;
std::map<GURL, std::unique_ptr<LookupTransaction>> lookup_transactions_;
- base::WeakPtrFactory<HttpCacheLookupManager> weak_factory_;
+ base::WeakPtrFactory<HttpCacheLookupManager> weak_factory_{this};
};
} // namespace net
diff --git a/net/http/http_cache_transaction.cc b/net/http/http_cache_transaction.cc
index d9e6d3ec..8ac21b2 100644
--- a/net/http/http_cache_transaction.cc
+++ b/net/http/http_cache_transaction.cc
@@ -193,8 +193,7 @@
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 640f851..da341f2 100644
--- a/net/http/http_cache_transaction.h
+++ b/net/http/http_cache_transaction.h
@@ -652,7 +652,7 @@
// True if the Transaction is currently processing the DoLoop.
bool in_do_loop_;
- base::WeakPtrFactory<Transaction> weak_factory_;
+ base::WeakPtrFactory<Transaction> 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 c20d5d3..5d8e78d 100644
--- a/net/http/http_cache_writers.cc
+++ b/net/http/http_cache_writers.cc
@@ -50,7 +50,7 @@
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 e914ab1..c638aeb 100644
--- a/net/http/http_cache_writers.h
+++ b/net/http/http_cache_writers.h
@@ -283,7 +283,7 @@
// end of DoLoop().
base::OnceClosure cache_callback_; // Callback for cache_.
- base::WeakPtrFactory<Writers> weak_factory_;
+ base::WeakPtrFactory<Writers> 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 bc41834..a9fbbdc 100644
--- a/net/http/http_proxy_connect_job.cc
+++ b/net/http/http_proxy_connect_job.cc
@@ -188,8 +188,7 @@
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 ef12a1e..7a7b967 100644
--- a/net/http/http_proxy_connect_job.h
+++ b/net/http/http_proxy_connect_job.h
@@ -239,7 +239,7 @@
// Time when the connection to the proxy was started.
base::TimeTicks connect_start_time_;
- base::WeakPtrFactory<HttpProxyConnectJob> weak_ptr_factory_;
+ base::WeakPtrFactory<HttpProxyConnectJob> 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 a1c3c961..b40cdca 100644
--- a/net/http/http_response_body_drainer_unittest.cc
+++ b/net/http/http_response_body_drainer_unittest.cc
@@ -85,8 +85,7 @@
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 @@
bool is_complete_;
bool can_reuse_connection_;
- base::WeakPtrFactory<MockHttpStream> weak_factory_;
+ base::WeakPtrFactory<MockHttpStream> 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 8fded9b..036dcde8 100644
--- a/net/http/http_stream_factory_job.cc
+++ b/net/http/http_stream_factory_job.cc
@@ -169,8 +169,7 @@
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 3a5488e..94d1a91 100644
--- a/net/http/http_stream_factory_job.h
+++ b/net/http/http_stream_factory_job.h
@@ -477,7 +477,7 @@
std::unique_ptr<SpdySessionPool::SpdySessionRequest> spdy_session_request_;
- base::WeakPtrFactory<Job> ptr_factory_;
+ base::WeakPtrFactory<Job> 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 3ec5177..c8b124b8 100644
--- a/net/http/http_stream_factory_job_controller.cc
+++ b/net/http/http_stream_factory_job_controller.cc
@@ -102,10 +102,9 @@
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 f24cdd7a..783759e 100644
--- a/net/http/http_stream_factory_job_controller.h
+++ b/net/http/http_stream_factory_job_controller.h
@@ -360,7 +360,7 @@
RequestPriority priority_;
const NetLogWithSource net_log_;
- base::WeakPtrFactory<JobController> ptr_factory_;
+ base::WeakPtrFactory<JobController> ptr_factory_{this};
};
} // namespace net
diff --git a/net/http/http_stream_factory_unittest.cc b/net/http/http_stream_factory_unittest.cc
index 21d6119..8162bec 100644
--- a/net/http/http_stream_factory_unittest.cc
+++ b/net/http/http_stream_factory_unittest.cc
@@ -113,8 +113,7 @@
kStreamTypeSpdy,
};
- explicit MockWebSocketHandshakeStream(StreamType type)
- : type_(type), weak_ptr_factory_(this) {}
+ explicit MockWebSocketHandshakeStream(StreamType type) : type_(type) {}
~MockWebSocketHandshakeStream() override = default;
@@ -173,7 +172,7 @@
private:
const StreamType type_;
- base::WeakPtrFactory<MockWebSocketHandshakeStream> weak_ptr_factory_;
+ base::WeakPtrFactory<MockWebSocketHandshakeStream> 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 6615a48..aa3874c 100644
--- a/net/http/http_stream_parser.cc
+++ b/net/http/http_stream_parser.cc
@@ -211,8 +211,7 @@
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 16d24e2..0d559c3a 100644
--- a/net/http/http_stream_parser.h
+++ b/net/http/http_stream_parser.h
@@ -303,7 +303,7 @@
MutableNetworkTrafficAnnotationTag traffic_annotation_;
- base::WeakPtrFactory<HttpStreamParser> weak_ptr_factory_;
+ base::WeakPtrFactory<HttpStreamParser> 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 16b77a3..e197da3 100644
--- a/net/http/http_stream_parser_unittest.cc
+++ b/net/http/http_stream_parser_unittest.cc
@@ -71,7 +71,7 @@
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 @@
const FailureMode async_;
- base::WeakPtrFactory<ReadErrorUploadDataStream> weak_factory_;
+ base::WeakPtrFactory<ReadErrorUploadDataStream> weak_factory_{this};
DISALLOW_COPY_AND_ASSIGN(ReadErrorUploadDataStream);
};
@@ -200,7 +200,7 @@
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 @@
return ERR_IO_PENDING;
}
- base::WeakPtrFactory<InitAsyncUploadDataStream> weak_factory_;
+ base::WeakPtrFactory<InitAsyncUploadDataStream> 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 ce61d097..28b65dd1 100644
--- a/net/http/http_transaction_test_util.cc
+++ b/net/http/http_transaction_test_util.cc
@@ -263,8 +263,7 @@
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 745a31f1..f1724b0 100644
--- a/net/http/http_transaction_test_util.h
+++ b/net/http/http_transaction_test_util.h
@@ -291,8 +291,7 @@
CompletionOnceCallback resume_start_callback_; // used for pause and restart.
- base::WeakPtrFactory<MockNetworkTransaction> weak_factory_;
-
+ base::WeakPtrFactory<MockNetworkTransaction> weak_factory_{this};
};
class MockNetworkLayer : public HttpTransactionFactory,
diff --git a/net/http/partial_data.cc b/net/http/partial_data.cc
index fa6b488..e0eb396 100644
--- a/net/http/partial_data.cc
+++ b/net/http/partial_data.cc
@@ -41,8 +41,7 @@
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 0ca5926..3e8b1a40 100644
--- a/net/http/partial_data.h
+++ b/net/http/partial_data.h
@@ -159,7 +159,7 @@
bool truncated_; // We have an incomplete 200 stored.
bool initial_validation_; // Only used for truncated entries.
CompletionOnceCallback callback_;
- base::WeakPtrFactory<PartialData> weak_factory_;
+ base::WeakPtrFactory<PartialData> 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 804ea45d..0df5a0f 100644
--- a/net/http/transport_security_persister.cc
+++ b/net/http/transport_security_persister.cc
@@ -219,8 +219,7 @@
: 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 bfc85cb3..c8ba1d8 100644
--- a/net/http/transport_security_persister.h
+++ b/net/http/transport_security_persister.h
@@ -131,7 +131,7 @@
scoped_refptr<base::SequencedTaskRunner> foreground_runner_;
scoped_refptr<base::SequencedTaskRunner> background_runner_;
- base::WeakPtrFactory<TransportSecurityPersister> weak_ptr_factory_;
+ base::WeakPtrFactory<TransportSecurityPersister> 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 a6ecb034..7b572840 100644
--- a/net/log/trace_net_log_observer.cc
+++ b/net/log/trace_net_log_observer.cc
@@ -47,8 +47,7 @@
} // 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 0d7d8567..eea49c8 100644
--- a/net/log/trace_net_log_observer.h
+++ b/net/log/trace_net_log_observer.h
@@ -41,7 +41,7 @@
private:
NetLog* net_log_to_watch_;
- base::WeakPtrFactory<TraceNetLogObserver> weak_factory_;
+ base::WeakPtrFactory<TraceNetLogObserver> 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 cf75fb6..6603eb8 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 @@
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 @@
// Backlog of tasks waiting on initialization.
std::vector<base::OnceClosure> task_backlog_;
- base::WeakPtrFactory<NetworkErrorLoggingServiceImpl> weak_factory_;
+ base::WeakPtrFactory<NetworkErrorLoggingServiceImpl> 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 b1f456e..d5b6730 100644
--- a/net/nqe/network_quality_estimator.cc
+++ b/net/nqe/network_quality_estimator.cc
@@ -174,8 +174,7 @@
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 3c111ea..32977a9 100644
--- a/net/nqe/network_quality_estimator.h
+++ b/net/nqe/network_quality_estimator.h
@@ -698,7 +698,7 @@
bool get_network_id_asynchronously_ = false;
#endif
- base::WeakPtrFactory<NetworkQualityEstimator> weak_ptr_factory_;
+ base::WeakPtrFactory<NetworkQualityEstimator> 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 aa444b0..102ad4b 100644
--- a/net/nqe/network_quality_store.cc
+++ b/net/nqe/network_quality_store.cc
@@ -15,7 +15,7 @@
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 5250e52..a1aedc35 100644
--- a/net/nqe/network_quality_store.h
+++ b/net/nqe/network_quality_store.h
@@ -99,7 +99,7 @@
SEQUENCE_CHECKER(sequence_checker_);
- base::WeakPtrFactory<NetworkQualityStore> weak_ptr_factory_;
+ base::WeakPtrFactory<NetworkQualityStore> 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 da10413f..506eeac 100644
--- a/net/proxy_resolution/pac_file_fetcher_impl.cc
+++ b/net/proxy_resolution/pac_file_fetcher_impl.cc
@@ -335,8 +335,7 @@
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 7bc1daa..397bf228 100644
--- a/net/proxy_resolution/pac_file_fetcher_impl.h
+++ b/net/proxy_resolution/pac_file_fetcher_impl.h
@@ -161,7 +161,7 @@
// Factory for creating the time-out task. This takes care of revoking
// outstanding tasks when |this| is deleted.
- base::WeakPtrFactory<PacFileFetcherImpl> weak_factory_;
+ base::WeakPtrFactory<PacFileFetcherImpl> 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 9f906ae1..9d817f7 100644
--- a/net/proxy_resolution/proxy_resolution_service.cc
+++ b/net/proxy_resolution/proxy_resolution_service.cc
@@ -691,8 +691,7 @@
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 @@
bool quick_check_enabled_;
- base::WeakPtrFactory<PacFileDeciderPoller> weak_factory_;
+ base::WeakPtrFactory<PacFileDeciderPoller> weak_factory_{this};
DISALLOW_COPY_AND_ASSIGN(PacFileDeciderPoller);
};
@@ -1066,8 +1065,7 @@
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 d2f1edc..cf516ef 100644
--- a/net/proxy_resolution/proxy_resolution_service.h
+++ b/net/proxy_resolution/proxy_resolution_service.h
@@ -443,7 +443,7 @@
// Flag used by |SetReady()| to check if |this| has been deleted by a
// synchronous callback.
- base::WeakPtrFactory<ProxyResolutionService> weak_ptr_factory_;
+ base::WeakPtrFactory<ProxyResolutionService> 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 06392df0..4445445 100644
--- a/net/quic/bidirectional_stream_quic_impl.cc
+++ b/net/quic/bidirectional_stream_quic_impl.cc
@@ -54,8 +54,7 @@
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 aa5f938..cb3927b 100644
--- a/net/quic/bidirectional_stream_quic_impl.h
+++ b/net/quic/bidirectional_stream_quic_impl.h
@@ -128,7 +128,7 @@
// True when callbacks to the delegate may be invoked synchronously.
bool may_invoke_callbacks_;
- base::WeakPtrFactory<BidirectionalStreamQuicImpl> weak_factory_;
+ base::WeakPtrFactory<BidirectionalStreamQuicImpl> 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 9124fb0..2eaf0bf 100644
--- a/net/quic/quic_chromium_alarm_factory.cc
+++ b/net/quic/quic_chromium_alarm_factory.cc
@@ -23,8 +23,7 @@
: 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 @@
// post a new task when the new deadline now earlier than when
// previously posted.
quic::QuicTime task_deadline_;
- base::WeakPtrFactory<QuicChromeAlarm> weak_factory_;
+ base::WeakPtrFactory<QuicChromeAlarm> weak_factory_{this};
};
} // namespace
@@ -92,7 +91,7 @@
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 1e47833..d190a05 100644
--- a/net/quic/quic_chromium_alarm_factory.h
+++ b/net/quic/quic_chromium_alarm_factory.h
@@ -40,7 +40,7 @@
private:
base::TaskRunner* task_runner_;
const quic::QuicClock* clock_;
- base::WeakPtrFactory<QuicChromiumAlarmFactory> weak_factory_;
+ base::WeakPtrFactory<QuicChromiumAlarmFactory> 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 a4a7b34c..adbe7514 100644
--- a/net/quic/quic_chromium_client_session.cc
+++ b/net/quic/quic_chromium_client_session.cc
@@ -566,8 +566,7 @@
: 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 @@
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 7f6b919..35efd18 100644
--- a/net/quic/quic_chromium_client_session.h
+++ b/net/quic/quic_chromium_client_session.h
@@ -355,7 +355,7 @@
const NetworkTrafficAnnotationTag traffic_annotation_;
- base::WeakPtrFactory<StreamRequest> weak_factory_;
+ base::WeakPtrFactory<StreamRequest> weak_factory_{this};
DISALLOW_COPY_AND_ASSIGN(StreamRequest);
};
@@ -840,7 +840,7 @@
bool headers_include_h2_stream_dependency_;
Http2PriorityDependencies priority_dependency_state_;
- base::WeakPtrFactory<QuicChromiumClientSession> weak_factory_;
+ base::WeakPtrFactory<QuicChromiumClientSession> 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 7b0c7a9..a2ce78f 100644
--- a/net/quic/quic_chromium_client_stream.cc
+++ b/net/quic/quic_chromium_client_stream.cc
@@ -46,8 +46,7 @@
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 @@
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 @@
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 b9773198..30baf2a5 100644
--- a/net/quic/quic_chromium_client_stream.h
+++ b/net/quic/quic_chromium_client_stream.h
@@ -192,7 +192,7 @@
NetLogWithSource net_log_;
- base::WeakPtrFactory<Handle> weak_factory_;
+ base::WeakPtrFactory<Handle> weak_factory_{this};
DISALLOW_COPY_AND_ASSIGN(Handle);
};
@@ -311,7 +311,7 @@
// Length of the HEADERS frame containing trailing headers.
size_t trailing_headers_frame_len_;
- base::WeakPtrFactory<QuicChromiumClientStream> weak_factory_;
+ base::WeakPtrFactory<QuicChromiumClientStream> 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 4f7ec5b..c0c2bc7 100644
--- a/net/quic/quic_chromium_packet_reader.cc
+++ b/net/quic/quic_chromium_packet_reader.cc
@@ -32,8 +32,7 @@
yield_after_(quic::QuicTime::Infinite()),
read_buffer_(base::MakeRefCounted<IOBufferWithSize>(
static_cast<size_t>(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 5734aa72..b4d2507 100644
--- a/net/quic/quic_chromium_packet_reader.h
+++ b/net/quic/quic_chromium_packet_reader.h
@@ -70,7 +70,7 @@
scoped_refptr<IOBufferWithSize> read_buffer_;
NetLogWithSource net_log_;
- base::WeakPtrFactory<QuicChromiumPacketReader> weak_factory_;
+ base::WeakPtrFactory<QuicChromiumPacketReader> 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 4cb3be9f..7c38674e 100644
--- a/net/quic/quic_chromium_packet_writer.cc
+++ b/net/quic/quic_chromium_packet_writer.cc
@@ -81,7 +81,7 @@
std::memcpy(data(), buffer, buf_len);
}
-QuicChromiumPacketWriter::QuicChromiumPacketWriter() : weak_factory_(this) {}
+QuicChromiumPacketWriter::QuicChromiumPacketWriter() {}
QuicChromiumPacketWriter::QuicChromiumPacketWriter(
DatagramClientSocket* socket,
@@ -92,8 +92,7 @@
base::MakeRefCounted<ReusableIOBuffer>(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 1a667f2..82acb30 100644
--- a/net/quic/quic_chromium_packet_writer.h
+++ b/net/quic/quic_chromium_packet_writer.h
@@ -126,7 +126,7 @@
base::OneShotTimer retry_timer_;
CompletionRepeatingCallback write_callback_;
- base::WeakPtrFactory<QuicChromiumPacketWriter> weak_factory_;
+ base::WeakPtrFactory<QuicChromiumPacketWriter> 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 7f33513..646d7cc 100644
--- a/net/quic/quic_connectivity_probing_manager.cc
+++ b/net/quic/quic_connectivity_probing_manager.cc
@@ -63,8 +63,7 @@
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 e18ae034..aa5bc7a 100644
--- a/net/quic/quic_connectivity_probing_manager.h
+++ b/net/quic/quic_connectivity_probing_manager.h
@@ -128,7 +128,7 @@
base::SequencedTaskRunner* task_runner_;
- base::WeakPtrFactory<QuicConnectivityProbingManager> weak_factory_;
+ base::WeakPtrFactory<QuicConnectivityProbingManager> 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 e2bbe9a..0d1da7f8 100644
--- a/net/quic/quic_http_stream.cc
+++ b/net/quic/quic_http_stream.cc
@@ -67,8 +67,7 @@
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 babc2a1..0440c76 100644
--- a/net/quic/quic_http_stream.h
+++ b/net/quic/quic_http_stream.h
@@ -218,7 +218,7 @@
// Session connect timing info.
LoadTimingInfo::ConnectTiming connect_timing_;
- base::WeakPtrFactory<QuicHttpStream> weak_factory_;
+ base::WeakPtrFactory<QuicHttpStream> 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 0d1a74d..eff65950 100644
--- a/net/quic/quic_http_stream_test.cc
+++ b/net/quic/quic_http_stream_test.cc
@@ -115,7 +115,7 @@
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 @@
const FailureMode async_;
- base::WeakPtrFactory<ReadErrorUploadDataStream> weak_factory_;
+ base::WeakPtrFactory<ReadErrorUploadDataStream> 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 3e925c90..36c67d1 100644
--- a/net/quic/quic_proxy_client_socket.cc
+++ b/net/quic/quic_proxy_client_socket.cc
@@ -36,8 +36,7 @@
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 d72aed88..299526c8 100644
--- a/net/quic/quic_proxy_client_socket.h
+++ b/net/quic/quic_proxy_client_socket.h
@@ -145,7 +145,7 @@
const NetLogWithSource net_log_;
// The default weak pointer factory.
- base::WeakPtrFactory<QuicProxyClientSocket> weak_factory_;
+ base::WeakPtrFactory<QuicProxyClientSocket> 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 d118d1dd..a4e2c6d0 100644
--- a/net/quic/quic_stream_factory.cc
+++ b/net/quic/quic_stream_factory.cc
@@ -267,8 +267,7 @@
std::make_unique<ProofVerifyContextChromium>(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 @@
const base::TimeTicks start_time_;
const NetLogWithSource net_log_;
CompletionOnceCallback callback_;
- base::WeakPtrFactory<CertVerifierJob> weak_factory_;
+ base::WeakPtrFactory<CertVerifierJob> weak_factory_{this};
DISALLOW_COPY_AND_ASSIGN(CertVerifierJob);
};
@@ -500,7 +499,7 @@
base::TimeTicks dns_resolution_start_time_;
base::TimeTicks dns_resolution_end_time_;
std::set<QuicStreamRequest*> stream_requests_;
- base::WeakPtrFactory<Job> weak_factory_;
+ base::WeakPtrFactory<Job> weak_factory_{this};
DISALLOW_COPY_AND_ASSIGN(Job);
};
@@ -533,8 +532,7 @@
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 @@
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 c3cc96f..a5de5f7 100644
--- a/net/quic/quic_stream_factory.h
+++ b/net/quic/quic_stream_factory.h
@@ -634,7 +634,7 @@
// The initial rtt for handshake.
const int initial_rtt_for_handshake_milliseconds_;
- base::WeakPtrFactory<QuicStreamFactory> weak_factory_;
+ base::WeakPtrFactory<QuicStreamFactory> 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 31bfde7a..c3069c93 100644
--- a/net/reporting/reporting_delivery_agent.cc
+++ b/net/reporting/reporting_delivery_agent.cc
@@ -55,9 +55,7 @@
public ReportingCacheObserver {
public:
ReportingDeliveryAgentImpl(ReportingContext* context)
- : context_(context),
- timer_(std::make_unique<base::OneShotTimer>()),
- weak_factory_(this) {
+ : context_(context), timer_(std::make_unique<base::OneShotTimer>()) {
context_->AddCacheObserver(this);
}
@@ -278,7 +276,7 @@
// (Would be an unordered_set, but there's no hash on pair.)
std::set<OriginGroup> pending_origin_groups_;
- base::WeakPtrFactory<ReportingDeliveryAgentImpl> weak_factory_;
+ base::WeakPtrFactory<ReportingDeliveryAgentImpl> weak_factory_{this};
DISALLOW_COPY_AND_ASSIGN(ReportingDeliveryAgentImpl);
};
diff --git a/net/server/http_server.cc b/net/server/http_server.cc
index 9b9116d..678d6f4 100644
--- a/net/server/http_server.cc
+++ b/net/server/http_server.cc
@@ -56,8 +56,7 @@
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 c6e2554c..cb70b57 100644
--- a/net/server/http_server.h
+++ b/net/server/http_server.h
@@ -131,7 +131,7 @@
int last_id_;
std::map<int, std::unique_ptr<HttpConnection>> id_to_connection_;
- base::WeakPtrFactory<HttpServer> weak_ptr_factory_;
+ base::WeakPtrFactory<HttpServer> 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 faa4951..7ece0376 100644
--- a/net/socket/client_socket_pool_base_unittest.cc
+++ b/net/socket/client_socket_pool_base_unittest.cc
@@ -334,8 +334,7 @@
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 @@
bool has_established_connection_;
bool store_additional_error_state_;
- base::WeakPtrFactory<TestConnectJob> weak_factory_;
+ base::WeakPtrFactory<TestConnectJob> 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 aea50374..db03e578 100644
--- a/net/socket/fuzzed_datagram_client_socket.cc
+++ b/net/socket/fuzzed_datagram_client_socket.cc
@@ -30,7 +30,7 @@
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 9659bec..f53eaec 100644
--- a/net/socket/fuzzed_datagram_client_socket.h
+++ b/net/socket/fuzzed_datagram_client_socket.h
@@ -91,7 +91,7 @@
IPEndPoint remote_address_;
- base::WeakPtrFactory<FuzzedDatagramClientSocket> weak_factory_;
+ base::WeakPtrFactory<FuzzedDatagramClientSocket> 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 7e2d4b9..a5fc9dbe 100644
--- a/net/socket/fuzzed_server_socket.cc
+++ b/net/socket/fuzzed_server_socket.cc
@@ -18,8 +18,7 @@
: 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 006fa85..03c64672 100644
--- a/net/socket/fuzzed_server_socket.h
+++ b/net/socket/fuzzed_server_socket.h
@@ -52,7 +52,7 @@
bool first_accept_;
bool listen_called_;
- base::WeakPtrFactory<FuzzedServerSocket> weak_factory_;
+ base::WeakPtrFactory<FuzzedServerSocket> weak_factory_{this};
DISALLOW_COPY_AND_ASSIGN(FuzzedServerSocket);
};
diff --git a/net/socket/fuzzed_socket.cc b/net/socket/fuzzed_socket.cc
index a71a6d5..9952f2d 100644
--- a/net/socket/fuzzed_socket.cc
+++ b/net/socket/fuzzed_socket.cc
@@ -40,8 +40,7 @@
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 63d069e..8e420c1 100644
--- a/net/socket/fuzzed_socket.h
+++ b/net/socket/fuzzed_socket.h
@@ -131,7 +131,7 @@
IPEndPoint remote_address_;
- base::WeakPtrFactory<FuzzedSocket> weak_factory_;
+ base::WeakPtrFactory<FuzzedSocket> 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 6e24969..6f134af6 100644
--- a/net/socket/socket_bio_adapter.cc
+++ b/net/socket/socket_bio_adapter.cc
@@ -66,8 +66,7 @@
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 9547535..98421c7 100644
--- a/net/socket/socket_bio_adapter.h
+++ b/net/socket/socket_bio_adapter.h
@@ -136,7 +136,7 @@
Delegate* delegate_;
- base::WeakPtrFactory<SocketBIOAdapter> weak_factory_;
+ base::WeakPtrFactory<SocketBIOAdapter> 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 69c1f95..183e3a78 100644
--- a/net/socket/socket_test_util.cc
+++ b/net/socket/socket_test_util.cc
@@ -361,8 +361,7 @@
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 @@
}
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 @@
: 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 @@
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 @@
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 9a53e1c..b9740cd 100644
--- a/net/socket/socket_test_util.h
+++ b/net/socket/socket_test_util.h
@@ -588,7 +588,7 @@
// Used by RunUntilPaused. NULL at all other times.
std::unique_ptr<base::RunLoop> run_until_paused_run_loop_;
- base::WeakPtrFactory<SequencedSocketData> weak_factory_;
+ base::WeakPtrFactory<SequencedSocketData> weak_factory_{this};
DISALLOW_COPY_AND_ASSIGN(SequencedSocketData);
};
@@ -752,7 +752,7 @@
NetLogWithSource net_log_;
private:
- base::WeakPtrFactory<MockClientSocket> weak_factory_;
+ base::WeakPtrFactory<MockClientSocket> weak_factory_{this};
DISALLOW_COPY_AND_ASSIGN(MockClientSocket);
};
@@ -913,7 +913,7 @@
ProxyClientSocketDataProvider* data_;
scoped_refptr<HttpAuthController> auth_controller_;
- base::WeakPtrFactory<MockProxyClientSocket> weak_factory_;
+ base::WeakPtrFactory<MockProxyClientSocket> weak_factory_{this};
DISALLOW_COPY_AND_ASSIGN(MockProxyClientSocket);
};
@@ -995,7 +995,7 @@
// Address of the "remote" peer we're connected to.
IPEndPoint peer_addr_;
- base::WeakPtrFactory<MockSSLClientSocket> weak_factory_;
+ base::WeakPtrFactory<MockSSLClientSocket> weak_factory_{this};
DISALLOW_COPY_AND_ASSIGN(MockSSLClientSocket);
};
@@ -1102,7 +1102,7 @@
bool data_transferred_ = false;
bool tagged_before_data_transferred_ = true;
- base::WeakPtrFactory<MockUDPClientSocket> weak_factory_;
+ base::WeakPtrFactory<MockUDPClientSocket> 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 19ca9e2..292c138 100644
--- a/net/socket/ssl_client_socket_impl.cc
+++ b/net/socket/ssl_client_socket_impl.cc
@@ -427,8 +427,7 @@
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 f4a1a687..4facc3da 100644
--- a/net/socket/ssl_client_socket_impl.h
+++ b/net/socket/ssl_client_socket_impl.h
@@ -302,7 +302,7 @@
bool is_fatal_cert_error_;
NetLogWithSource net_log_;
- base::WeakPtrFactory<SSLClientSocketImpl> weak_factory_;
+ base::WeakPtrFactory<SSLClientSocketImpl> 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 dac7d7e..1fe8b18b 100644
--- a/net/socket/ssl_server_socket_impl.cc
+++ b/net/socket/ssl_server_socket_impl.cc
@@ -212,7 +212,7 @@
NextProto negotiated_protocol_;
- base::WeakPtrFactory<SocketImpl> weak_factory_;
+ base::WeakPtrFactory<SocketImpl> weak_factory_{this};
DISALLOW_COPY_AND_ASSIGN(SocketImpl);
};
@@ -228,8 +228,7 @@
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 8a8095b..200b90a 100644
--- a/net/socket/ssl_server_socket_unittest.cc
+++ b/net/socket/ssl_server_socket_unittest.cc
@@ -103,11 +103,7 @@
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 @@
// asynchronously.
bool write_called_after_close_;
- base::WeakPtrFactory<FakeDataChannel> weak_factory_;
+ base::WeakPtrFactory<FakeDataChannel> 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 088d768..46d0a7d 100644
--- a/net/socket/tcp_client_socket.cc
+++ b/net/socket/tcp_client_socket.cc
@@ -142,8 +142,7 @@
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 1bf0038..306c6b35 100644
--- a/net/socket/tcp_client_socket.h
+++ b/net/socket/tcp_client_socket.h
@@ -207,7 +207,7 @@
// Connect() or Disconnect() is called.
bool was_disconnected_on_suspend_;
- base::WeakPtrFactory<TCPClientSocket> weak_ptr_factory_;
+ base::WeakPtrFactory<TCPClientSocket> 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 a69add8a5..86f647c10 100644
--- a/net/socket/transport_client_socket_pool.cc
+++ b/net/socket/transport_client_socket_pool.cc
@@ -780,8 +780,7 @@
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 2f611482..02ac61e 100644
--- a/net/socket/transport_client_socket_pool.h
+++ b/net/socket/transport_client_socket_pool.h
@@ -795,7 +795,7 @@
SSLConfigService* const ssl_config_service_;
- base::WeakPtrFactory<TransportClientSocketPool> weak_factory_;
+ base::WeakPtrFactory<TransportClientSocketPool> 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 bf8b36601..8d67fbf 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 @@
: 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 @@
CompletionOnceCallback callback_;
ConnectionAttempts connection_attempts_;
- base::WeakPtrFactory<MockTriggerableClientSocket> weak_factory_;
+ base::WeakPtrFactory<MockTriggerableClientSocket> 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 047ac7a..dafaeca 100644
--- a/net/socket/transport_connect_job.cc
+++ b/net/socket/transport_connect_job.cc
@@ -101,8 +101,7 @@
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 0258e52..69b763d 100644
--- a/net/socket/transport_connect_job.h
+++ b/net/socket/transport_connect_job.h
@@ -170,7 +170,7 @@
ConnectionAttempts connection_attempts_;
ConnectionAttempts fallback_connection_attempts_;
- base::WeakPtrFactory<TransportConnectJob> weak_ptr_factory_;
+ base::WeakPtrFactory<TransportConnectJob> 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 4c340828..05018ff 100644
--- a/net/socket/udp_socket_perftest.cc
+++ b/net/socket/udp_socket_perftest.cc
@@ -30,8 +30,7 @@
class UDPSocketPerfTest : public PlatformTest {
public:
UDPSocketPerfTest()
- : buffer_(base::MakeRefCounted<IOBufferWithSize>(kPacketSize)),
- weak_factory_(this) {}
+ : buffer_(base::MakeRefCounted<IOBufferWithSize>(kPacketSize)) {}
void DoneWritePacketsToSocket(UDPClientSocket* socket,
int num_of_packets,
@@ -52,7 +51,7 @@
protected:
static const int kPacketSize = 1024;
scoped_refptr<IOBufferWithSize> buffer_;
- base::WeakPtrFactory<UDPSocketPerfTest> weak_factory_;
+ base::WeakPtrFactory<UDPSocketPerfTest> weak_factory_{this};
};
const int UDPSocketPerfTest::kPacketSize;
diff --git a/net/socket/udp_socket_posix.cc b/net/socket/udp_socket_posix.cc
index 08bf79c..f09bd57 100644
--- a/net/socket/udp_socket_posix.cc
+++ b/net/socket/udp_socket_posix.cc
@@ -200,8 +200,7 @@
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 c62b4a8..ce96046e 100644
--- a/net/socket/udp_socket_posix.h
+++ b/net/socket/udp_socket_posix.h
@@ -632,7 +632,7 @@
THREAD_CHECKER(thread_checker_);
// Used for alternate writes that are posted for concurrent execution.
- base::WeakPtrFactory<UDPSocketPosix> weak_factory_;
+ base::WeakPtrFactory<UDPSocketPosix> 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 42a42a1..b4a773fd3 100644
--- a/net/socket/udp_socket_posix_unittest.cc
+++ b/net/socket/udp_socket_posix_unittest.cc
@@ -133,8 +133,7 @@
: 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 @@
struct iovec msg_iov_[kNumMsgs];
struct mmsghdr msgvec_[kNumMsgs];
#endif
- base::WeakPtrFactory<UDPSocketPosixTest> weak_factory_;
+ base::WeakPtrFactory<UDPSocketPosixTest> 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 cdf90aa..9124b235 100644
--- a/net/socket/websocket_endpoint_lock_manager.cc
+++ b/net/socket/websocket_endpoint_lock_manager.cc
@@ -47,8 +47,7 @@
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 2d7cdf5..4e96c73 100644
--- a/net/socket/websocket_endpoint_lock_manager.h
+++ b/net/socket/websocket_endpoint_lock_manager.h
@@ -130,7 +130,7 @@
// Number of sockets currently pending unlock.
size_t pending_unlock_count_;
- base::WeakPtrFactory<WebSocketEndpointLockManager> weak_factory_;
+ base::WeakPtrFactory<WebSocketEndpointLockManager> 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 820288f6..8202699 100644
--- a/net/socket/websocket_transport_client_socket_pool.cc
+++ b/net/socket/websocket_transport_client_socket_pool.cc
@@ -36,8 +36,7 @@
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 f1d5f0d..904e719 100644
--- a/net/socket/websocket_transport_client_socket_pool.h
+++ b/net/socket/websocket_transport_client_socket_pool.h
@@ -211,7 +211,7 @@
int handed_out_socket_count_;
bool flushing_;
- base::WeakPtrFactory<WebSocketTransportClientSocketPool> weak_factory_;
+ base::WeakPtrFactory<WebSocketTransportClientSocketPool> 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 1b80ee69..5510ec1 100644
--- a/net/socket/websocket_transport_connect_job.cc
+++ b/net/socket/websocket_transport_connect_job.cc
@@ -41,8 +41,7 @@
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 6ba51a0..cfd0ed3 100644
--- a/net/socket/websocket_transport_connect_job.h
+++ b/net/socket/websocket_transport_connect_job.h
@@ -106,7 +106,7 @@
bool had_ipv4_;
bool had_ipv6_;
- base::WeakPtrFactory<WebSocketTransportConnectJob> weak_ptr_factory_;
+ base::WeakPtrFactory<WebSocketTransportConnectJob> 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 32d0999..f428a75 100644
--- a/net/spdy/bidirectional_stream_spdy_impl.cc
+++ b/net/spdy/bidirectional_stream_spdy_impl.cc
@@ -45,8 +45,7 @@
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 7266e66..954a6782 100644
--- a/net/spdy/bidirectional_stream_spdy_impl.h
+++ b/net/spdy/bidirectional_stream_spdy_impl.h
@@ -130,7 +130,7 @@
// Keep a reference here so it is alive until OnDataSent is invoked.
scoped_refptr<IOBuffer> pending_combined_buffer_;
- base::WeakPtrFactory<BidirectionalStreamSpdyImpl> weak_factory_;
+ base::WeakPtrFactory<BidirectionalStreamSpdyImpl> 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 e451588..438d41a4d 100644
--- a/net/spdy/spdy_http_stream.cc
+++ b/net/spdy/spdy_http_stream.cc
@@ -121,8 +121,7 @@
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 643c4f3..a647849 100644
--- a/net/spdy/spdy_http_stream.h
+++ b/net/spdy/spdy_http_stream.h
@@ -233,7 +233,7 @@
base::debug::StackTrace stack_trace_;
#endif
- base::WeakPtrFactory<SpdyHttpStream> weak_factory_;
+ base::WeakPtrFactory<SpdyHttpStream> 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 6993bbbe..fd84847 100644
--- a/net/spdy/spdy_http_stream_unittest.cc
+++ b/net/spdy/spdy_http_stream_unittest.cc
@@ -76,7 +76,7 @@
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 @@
const FailureMode async_;
- base::WeakPtrFactory<ReadErrorUploadDataStream> weak_factory_;
+ base::WeakPtrFactory<ReadErrorUploadDataStream> 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 3330305..ee9883f 100644
--- a/net/spdy/spdy_proxy_client_socket.cc
+++ b/net/spdy/spdy_proxy_client_socket.cc
@@ -46,9 +46,7 @@
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 02a2ecf..eb47162 100644
--- a/net/spdy/spdy_proxy_client_socket.h
+++ b/net/spdy/spdy_proxy_client_socket.h
@@ -173,11 +173,12 @@
const NetLogSource source_dependency_;
// The default weak pointer factory.
- base::WeakPtrFactory<SpdyProxyClientSocket> weak_factory_;
+ base::WeakPtrFactory<SpdyProxyClientSocket> weak_factory_{this};
// Only used for posting write callbacks. Weak pointers created by this
// factory are invalidated in Disconnect().
- base::WeakPtrFactory<SpdyProxyClientSocket> write_callback_weak_factory_;
+ base::WeakPtrFactory<SpdyProxyClientSocket> 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 db133a9..3f9913d8 100644
--- a/net/spdy/spdy_session.cc
+++ b/net/spdy/spdy_session.cc
@@ -646,7 +646,7 @@
}
}
-SpdyStreamRequest::SpdyStreamRequest() : weak_ptr_factory_(this) {
+SpdyStreamRequest::SpdyStreamRequest() {
Reset();
}
@@ -953,8 +953,7 @@
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 f936200..7de36a4 100644
--- a/net/spdy/spdy_session.h
+++ b/net/spdy/spdy_session.h
@@ -285,7 +285,7 @@
MutableNetworkTrafficAnnotationTag traffic_annotation_;
State next_state_;
- base::WeakPtrFactory<SpdyStreamRequest> weak_ptr_factory_;
+ base::WeakPtrFactory<SpdyStreamRequest> weak_ptr_factory_{this};
DISALLOW_COPY_AND_ASSIGN(SpdyStreamRequest);
};
@@ -1212,7 +1212,7 @@
// 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<SpdySession> weak_factory_;
+ base::WeakPtrFactory<SpdySession> weak_factory_{this};
};
} // namespace net
diff --git a/net/spdy/spdy_session_pool.cc b/net/spdy/spdy_session_pool.cc
index 924c40c1a..7a6e27fc 100644
--- a/net/spdy/spdy_session_pool.cc
+++ b/net/spdy/spdy_session_pool.cc
@@ -103,8 +103,7 @@
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 143d5645..3dbfba25 100644
--- a/net/spdy/spdy_session_pool.h
+++ b/net/spdy/spdy_session_pool.h
@@ -447,7 +447,7 @@
NetworkQualityEstimator* network_quality_estimator_;
- base::WeakPtrFactory<SpdySessionPool> weak_ptr_factory_;
+ base::WeakPtrFactory<SpdySessionPool> weak_ptr_factory_{this};
DISALLOW_COPY_AND_ASSIGN(SpdySessionPool);
};
diff --git a/net/spdy/spdy_stream.cc b/net/spdy/spdy_stream.cc
index 0580256..93e68b3 100644
--- a/net/spdy/spdy_stream.cc
+++ b/net/spdy/spdy_stream.cc
@@ -111,8 +111,7 @@
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 a7a8e7b4c..efdc0d9b 100644
--- a/net/spdy/spdy_stream.h
+++ b/net/spdy/spdy_stream.h
@@ -530,7 +530,7 @@
const NetworkTrafficAnnotationTag traffic_annotation_;
- base::WeakPtrFactory<SpdyStream> weak_ptr_factory_;
+ base::WeakPtrFactory<SpdyStream> 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 67597609..df24528c 100644
--- a/net/ssl/threaded_ssl_private_key.cc
+++ b/net/ssl/threaded_ssl_private_key.cc
@@ -53,8 +53,7 @@
std::unique_ptr<ThreadedSSLPrivateKey::Delegate> delegate,
scoped_refptr<base::SingleThreadTaskRunner> 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 87dd94a..21c0483 100644
--- a/net/ssl/threaded_ssl_private_key.h
+++ b/net/ssl/threaded_ssl_private_key.h
@@ -81,7 +81,7 @@
scoped_refptr<Core> core_;
scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
- base::WeakPtrFactory<ThreadedSSLPrivateKey> weak_factory_;
+ base::WeakPtrFactory<ThreadedSSLPrivateKey> 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 bb50901..e7470f2b 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 @@
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 efb23fd..22406a7 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 @@
SEQUENCE_CHECKER(sequence_checker_);
- base::WeakPtrFactory<ControllableHttpResponse> weak_ptr_factory_;
+ base::WeakPtrFactory<ControllableHttpResponse> 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 b24b44f5..6ebe322c 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 @@
: 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 7978c024..cb416137 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 @@
ServerCertificate cert_;
std::unique_ptr<SSLServerContext> context_;
- base::WeakPtrFactory<EmbeddedTestServer> weak_factory_;
+ base::WeakPtrFactory<EmbeddedTestServer> 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 18bd4c7..52bae82 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 InfiniteResponse : public BasicHttpResponse {
public:
- InfiniteResponse() : weak_ptr_factory_(this) {}
+ InfiniteResponse() {}
void SendResponse(const SendBytesCallback& send,
const SendCompleteCallback& done) override {
@@ -430,7 +430,7 @@
weak_ptr_factory_.GetWeakPtr(), send)));
}
- base::WeakPtrFactory<InfiniteResponse> weak_ptr_factory_;
+ base::WeakPtrFactory<InfiniteResponse> 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 8d30091f..93186075 100644
--- a/net/test/embedded_test_server/http_connection.cc
+++ b/net/test/embedded_test_server/http_connection.cc
@@ -18,8 +18,7 @@
const HandleRequestCallback& callback)
: socket_(std::move(socket)),
callback_(callback),
- read_buf_(base::MakeRefCounted<IOBufferWithSize>(4096)),
- weak_factory_(this) {}
+ read_buf_(base::MakeRefCounted<IOBufferWithSize>(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 bbf0398..041cea53 100644
--- a/net/test/embedded_test_server/http_connection.h
+++ b/net/test/embedded_test_server/http_connection.h
@@ -66,7 +66,7 @@
HttpRequestParser request_parser_;
scoped_refptr<IOBufferWithSize> read_buf_;
- base::WeakPtrFactory<HttpConnection> weak_factory_;
+ base::WeakPtrFactory<HttpConnection> 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 b7d79064..22584a9 100644
--- a/net/test/tcp_socket_proxy.cc
+++ b/net/test/tcp_socket_proxy.cc
@@ -134,13 +134,13 @@
THREAD_CHECKER(thread_checker_);
- base::WeakPtrFactory<ConnectionProxy> weak_factory_;
+ base::WeakPtrFactory<ConnectionProxy> weak_factory_{this};
DISALLOW_COPY_AND_ASSIGN(ConnectionProxy);
};
ConnectionProxy::ConnectionProxy(std::unique_ptr<StreamSocket> 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 f7bcf66f..5044c74 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 @@
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 b3b372e8..7a2c86f7 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 @@
void NotifyError();
- base::WeakPtrFactory<SSLCertificateErrorJob> weak_factory_;
+ base::WeakPtrFactory<SSLCertificateErrorJob> 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 a893f72..3000861 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 @@
: 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 1e2695c..8ce4763f 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 @@
const int net_error_;
int64_t total_received_bytes_;
- base::WeakPtrFactory<URLRequestFailedJob> weak_factory_;
+ base::WeakPtrFactory<URLRequestFailedJob> 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 2cae64e..df9bf44 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 @@
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 83ac941e..bd4a4a7 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 @@
void StartAsync();
const int content_length_;
- base::WeakPtrFactory<URLRequestHangingReadJob> weak_factory_;
+ base::WeakPtrFactory<URLRequestHangingReadJob> 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 71a10f7..59e69f9 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 @@
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 cd70f2a..1e183699 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 @@
std::string data_;
size_t data_offset_;
bool request_client_certificate_;
- base::WeakPtrFactory<URLRequestMockDataJob> weak_factory_;
+ base::WeakPtrFactory<URLRequestMockDataJob> 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 803480e2..40495441 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 @@
: 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 e0c4ce8..9c35bf95 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 @@
std::string raw_headers_;
int64_t total_received_bytes_ = 0;
- base::WeakPtrFactory<URLRequestMockHTTPJob> weak_ptr_factory_;
+ base::WeakPtrFactory<URLRequestMockHTTPJob> 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 3b54373..2195db8 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 @@
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 d90acb2f4..c7302c9 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 @@
scoped_refptr<IOBuffer> buffer_;
int buffer_size_;
- base::WeakPtrFactory<URLRequestSlowDownloadJob> weak_factory_;
+ base::WeakPtrFactory<URLRequestSlowDownloadJob> 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 cdd598cc..9c05123 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 @@
buf_(base::MakeRefCounted<IOBuffer>(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 e578c1a..6d87391 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 @@
bool headers_set_;
std::unique_ptr<quic::QuicBackendResponse> quic_response_;
- base::WeakPtrFactory<QuicHttpProxyBackendStream> weak_factory_;
+ base::WeakPtrFactory<QuicHttpProxyBackendStream> 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 f3a25e8..fb8651d1 100644
--- a/net/tools/quic/quic_simple_client.cc
+++ b/net/tools/quic/quic_simple_client.cc
@@ -47,8 +47,7 @@
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 2c682a5..add25ad7 100644
--- a/net/tools/quic/quic_simple_client.h
+++ b/net/tools/quic/quic_simple_client.h
@@ -57,7 +57,7 @@
// Tracks if the client is initialized to connect.
bool initialized_;
- base::WeakPtrFactory<QuicSimpleClient> weak_factory_;
+ base::WeakPtrFactory<QuicSimpleClient> 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 2349d45..a4f09f7 100644
--- a/net/tools/quic/quic_simple_server.cc
+++ b/net/tools/quic/quic_simple_server.cc
@@ -59,8 +59,7 @@
read_pending_(false),
synchronous_read_count_(0),
read_buffer_(base::MakeRefCounted<IOBufferWithSize>(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 743b883..6d7c36c 100644
--- a/net/tools/quic/quic_simple_server.h
+++ b/net/tools/quic/quic_simple_server.h
@@ -119,7 +119,7 @@
quic::QuicSimpleServerBackend* quic_simple_server_backend_;
- base::WeakPtrFactory<QuicSimpleServer> weak_factory_;
+ base::WeakPtrFactory<QuicSimpleServer> 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 6e71a9d..10730abc 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 @@
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 967eda87..76f8b8e 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 @@
// Whether a write is currently in flight.
bool write_blocked_;
- base::WeakPtrFactory<QuicSimpleServerPacketWriter> weak_factory_;
+ base::WeakPtrFactory<QuicSimpleServerPacketWriter> 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 7528b22..5a77624 100644
--- a/net/url_request/test_url_fetcher_factory.cc
+++ b/net/url_request/test_url_fetcher_factory.cc
@@ -359,8 +359,7 @@
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 cbd0cde8a..2bf8b6f 100644
--- a/net/url_request/test_url_fetcher_factory.h
+++ b/net/url_request/test_url_fetcher_factory.h
@@ -326,7 +326,7 @@
void RunDelegate();
int64_t response_bytes_;
- base::WeakPtrFactory<FakeURLFetcher> weak_factory_;
+ base::WeakPtrFactory<FakeURLFetcher> 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 e4237b9a..acc7563 100644
--- a/net/url_request/url_fetcher_response_writer.cc
+++ b/net/url_request/url_fetcher_response_writer.cc
@@ -56,8 +56,7 @@
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 1415ba6..202cf63 100644
--- a/net/url_request/url_fetcher_response_writer.h
+++ b/net/url_request/url_fetcher_response_writer.h
@@ -141,7 +141,7 @@
CompletionOnceCallback callback_;
- base::WeakPtrFactory<URLFetcherFileWriter> weak_factory_;
+ base::WeakPtrFactory<URLFetcherFileWriter> 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 974cd09..ea057ba 100644
--- a/net/url_request/url_request.cc
+++ b/net/url_request/url_request.cc
@@ -616,8 +616,7 @@
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 695fb9a..2a095007 100644
--- a/net/url_request/url_request.h
+++ b/net/url_request/url_request.h
@@ -1025,7 +1025,7 @@
THREAD_CHECKER(thread_checker_);
- base::WeakPtrFactory<URLRequest> weak_factory_;
+ base::WeakPtrFactory<URLRequest> 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 0eda199..aba7e57 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 efd6b66..2ce3f8d 100644
--- a/net/url_request/url_request_error_job.h
+++ b/net/url_request/url_request_error_job.h
@@ -30,7 +30,7 @@
int error_;
- base::WeakPtrFactory<URLRequestErrorJob> weak_factory_;
+ base::WeakPtrFactory<URLRequestErrorJob> 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 ca05b6c3..97d9384 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 @@
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 b0858ac9..4184f3c 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 @@
scoped_refptr<IOBuffer> read_buffer_;
int read_buffer_length_;
- base::WeakPtrFactory<URLRequestFileDirJob> weak_factory_;
+ base::WeakPtrFactory<URLRequestFileDirJob> 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 7896803..955816bd 100644
--- a/net/url_request/url_request_file_job.cc
+++ b/net/url_request/url_request_file_job.cc
@@ -64,8 +64,7 @@
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 d074eb5..b41eda0 100644
--- a/net/url_request/url_request_file_job.h
+++ b/net/url_request/url_request_file_job.h
@@ -132,7 +132,7 @@
Error range_parse_result_;
- base::WeakPtrFactory<URLRequestFileJob> weak_ptr_factory_;
+ base::WeakPtrFactory<URLRequestFileJob> 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 b136af5..85b36e2 100644
--- a/net/url_request/url_request_ftp_job.cc
+++ b/net/url_request/url_request_ftp_job.cc
@@ -50,8 +50,7 @@
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 7d0648e..a8dd912 100644
--- a/net/url_request/url_request_ftp_job.h
+++ b/net/url_request/url_request_ftp_job.h
@@ -93,7 +93,7 @@
FtpTransactionFactory* ftp_transaction_factory_;
FtpAuthCache* ftp_auth_cache_;
- base::WeakPtrFactory<URLRequestFtpJob> weak_factory_;
+ base::WeakPtrFactory<URLRequestFtpJob> 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 90be1ef..9981b87 100644
--- a/net/url_request/url_request_http_job.cc
+++ b/net/url_request/url_request_http_job.cc
@@ -292,8 +292,7 @@
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 b02453a..0162bfb 100644
--- a/net/url_request/url_request_http_job.h
+++ b/net/url_request/url_request_http_job.h
@@ -255,7 +255,7 @@
RequestHeadersCallback request_headers_callback_;
ResponseHeadersCallback response_headers_callback_;
- base::WeakPtrFactory<URLRequestHttpJob> weak_factory_;
+ base::WeakPtrFactory<URLRequestHttpJob> 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 18d56f1e..4cc5bb4 100644
--- a/net/url_request/url_request_job.cc
+++ b/net/url_request/url_request_job.cc
@@ -87,9 +87,7 @@
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 df3eda2..c24ee2e 100644
--- a/net/url_request/url_request_job.h
+++ b/net/url_request/url_request_job.h
@@ -462,7 +462,7 @@
// completed.
CompletionOnceCallback read_raw_callback_;
- base::WeakPtrFactory<URLRequestJob> weak_factory_;
+ base::WeakPtrFactory<URLRequestJob> 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 7f887ea..55664cf79 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 @@
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 @@
NotifyHeadersComplete();
}
- base::WeakPtrFactory<MockURLRequestJob> weak_factory_;
+ base::WeakPtrFactory<MockURLRequestJob> 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 028d0b6..13778fd 100644
--- a/net/url_request/url_request_redirect_job.cc
+++ b/net/url_request/url_request_redirect_job.cc
@@ -33,8 +33,7 @@
: 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 097ffa8..8d7b861 100644
--- a/net/url_request/url_request_redirect_job.h
+++ b/net/url_request/url_request_redirect_job.h
@@ -61,7 +61,7 @@
scoped_refptr<HttpResponseHeaders> fake_headers_;
- base::WeakPtrFactory<URLRequestRedirectJob> weak_factory_;
+ base::WeakPtrFactory<URLRequestRedirectJob> 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 6b5b585..c514128 100644
--- a/net/url_request/url_request_simple_job.cc
+++ b/net/url_request/url_request_simple_job.cc
@@ -35,10 +35,7 @@
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 a27e819..18ead7d 100644
--- a/net/url_request/url_request_simple_job.h
+++ b/net/url_request/url_request_simple_job.h
@@ -70,7 +70,7 @@
std::string charset_;
scoped_refptr<base::RefCountedMemory> data_;
int64_t next_data_offset_;
- base::WeakPtrFactory<URLRequestSimpleJob> weak_factory_;
+ base::WeakPtrFactory<URLRequestSimpleJob> 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 da2b8d61..45861e53 100644
--- a/net/url_request/url_request_test_job.cc
+++ b/net/url_request/url_request_test_job.cc
@@ -157,8 +157,7 @@
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 @@
response_headers_(base::MakeRefCounted<net::HttpResponseHeaders>(
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 88df017..59e91cc6 100644
--- a/net/url_request/url_request_test_job.h
+++ b/net/url_request/url_request_test_job.h
@@ -200,7 +200,7 @@
bool async_reads_;
- base::WeakPtrFactory<URLRequestTestJob> weak_factory_;
+ base::WeakPtrFactory<URLRequestTestJob> weak_factory_{this};
};
} // namespace net
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc
index 50599f61..74d7bb22 100644
--- a/net/url_request/url_request_unittest.cc
+++ b/net/url_request/url_request_unittest.cc
@@ -537,7 +537,7 @@
// Closure to run to exit RunUntilBlocked().
base::OnceClosure on_blocked_;
- base::WeakPtrFactory<BlockingNetworkDelegate> weak_factory_;
+ base::WeakPtrFactory<BlockingNetworkDelegate> weak_factory_{this};
DISALLOW_COPY_AND_ASSIGN(BlockingNetworkDelegate);
};
@@ -548,8 +548,7 @@
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 88f8646..3199a93 100644
--- a/net/websockets/websocket_basic_handshake_stream.cc
+++ b/net/websockets/websocket_basic_handshake_stream.cc
@@ -179,8 +179,7 @@
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 69e14b8..31986aa 100644
--- a/net/websockets/websocket_basic_handshake_stream.h
+++ b/net/websockets/websocket_basic_handshake_stream.h
@@ -149,7 +149,7 @@
WebSocketEndpointLockManager* const websocket_endpoint_lock_manager_;
- base::WeakPtrFactory<WebSocketBasicHandshakeStream> weak_ptr_factory_;
+ base::WeakPtrFactory<WebSocketBasicHandshakeStream> 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 7bdf9dbbd..789804f0 100644
--- a/net/websockets/websocket_basic_stream_adapters.cc
+++ b/net/websockets/websocket_basic_stream_adapters.cc
@@ -57,8 +57,7 @@
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 350a722..6c2ee1f 100644
--- a/net/websockets/websocket_basic_stream_adapters.h
+++ b/net/websockets/websocket_basic_stream_adapters.h
@@ -144,7 +144,7 @@
NetLogWithSource net_log_;
- base::WeakPtrFactory<WebSocketSpdyStreamAdapter> weak_factory_;
+ base::WeakPtrFactory<WebSocketSpdyStreamAdapter> weak_factory_{this};
};
} // namespace net
diff --git a/net/websockets/websocket_channel_test.cc b/net/websockets/websocket_channel_test.cc
index a55e266f..cb83f9c0 100644
--- a/net/websockets/websocket_channel_test.cc
+++ b/net/websockets/websocket_channel_test.cc
@@ -660,7 +660,7 @@
// 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<std::unique_ptr<WebSocketFrame>>* frames,
CompletionOnceCallback callback) override {
@@ -697,7 +697,7 @@
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<ResetOnWriteFakeWebSocketStream> weak_ptr_factory_;
+ base::WeakPtrFactory<ResetOnWriteFakeWebSocketStream> 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 ecd4ecc..99910c99b 100644
--- a/net/websockets/websocket_http2_handshake_stream.cc
+++ b/net/websockets/websocket_http2_handshake_stream.cc
@@ -53,8 +53,7 @@
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 af73445..23ab9d2 100644
--- a/net/websockets/websocket_http2_handshake_stream.h
+++ b/net/websockets/websocket_http2_handshake_stream.h
@@ -177,7 +177,7 @@
// to avoid including extension-related header files here.
std::unique_ptr<WebSocketExtensionParams> extension_params_;
- base::WeakPtrFactory<WebSocketHttp2HandshakeStream> weak_ptr_factory_;
+ base::WeakPtrFactory<WebSocketHttp2HandshakeStream> weak_ptr_factory_{this};
DISALLOW_COPY_AND_ASSIGN(WebSocketHttp2HandshakeStream);
};
