Chromium Code Reviews| Index: net/base/network_change_notifier_win.cc |
| diff --git a/net/base/network_change_notifier_win.cc b/net/base/network_change_notifier_win.cc |
| index 9b2b35ec76bfbc08a1ac6008dbf9f85b80a2618b..818fa5336d443923ebe3ee2cf8caced3cf5097c1 100644 |
| --- a/net/base/network_change_notifier_win.cc |
| +++ b/net/base/network_change_notifier_win.cc |
| @@ -65,6 +65,7 @@ NetworkChangeNotifierWin::NetworkChangeNotifierWin() |
| } |
| NetworkChangeNotifierWin::~NetworkChangeNotifierWin() { |
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); |
| if (is_watching_) { |
| CancelIPChangeNotify(&addr_overlapped_); |
|
mmenke
2017/05/26 20:20:03
This class uses an overlapped structure, which I d
|
| addr_watcher_.StopWatching(); |
| @@ -136,7 +137,7 @@ NetworkChangeNotifierWin::NetworkChangeCalculatorParamsWin() { |
| // |
| NetworkChangeNotifier::ConnectionType |
| NetworkChangeNotifierWin::RecomputeCurrentConnectionType() const { |
| - DCHECK(CalledOnValidThread()); |
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); |
| EnsureWinsockInit(); |
| @@ -218,7 +219,7 @@ void NetworkChangeNotifierWin::SetCurrentConnectionType( |
| } |
| void NetworkChangeNotifierWin::OnObjectSignaled(HANDLE object) { |
| - DCHECK(CalledOnValidThread()); |
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); |
| DCHECK(is_watching_); |
| is_watching_ = false; |
| @@ -229,7 +230,7 @@ void NetworkChangeNotifierWin::OnObjectSignaled(HANDLE object) { |
| } |
| void NetworkChangeNotifierWin::NotifyObservers() { |
| - DCHECK(CalledOnValidThread()); |
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); |
| SetCurrentConnectionType(RecomputeCurrentConnectionType()); |
| NotifyObserversOfIPAddressChange(); |
| @@ -246,7 +247,7 @@ void NetworkChangeNotifierWin::NotifyObservers() { |
| } |
| void NetworkChangeNotifierWin::WatchForAddressChange() { |
| - DCHECK(CalledOnValidThread()); |
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); |
| DCHECK(!is_watching_); |
| // NotifyAddrChange occasionally fails with ERROR_OPEN_FAILED for unknown |
| @@ -287,7 +288,7 @@ void NetworkChangeNotifierWin::WatchForAddressChange() { |
| } |
| bool NetworkChangeNotifierWin::WatchForAddressChangeInternal() { |
| - DCHECK(CalledOnValidThread()); |
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); |
| if (!dns_config_service_thread_->IsRunning()) { |
| dns_config_service_thread_->StartWithOptions( |