| Index: chrome/browser/chromeos/net/network_portal_detector_impl.cc
|
| diff --git a/chrome/browser/chromeos/net/network_portal_detector_impl.cc b/chrome/browser/chromeos/net/network_portal_detector_impl.cc
|
| index 2cec9cd3c45b968fde06a7735948442577539c8c..d16ab5718e42d70ef61d2141b0a9c0ebb1068dfe 100644
|
| --- a/chrome/browser/chromeos/net/network_portal_detector_impl.cc
|
| +++ b/chrome/browser/chromeos/net/network_portal_detector_impl.cc
|
| @@ -245,7 +245,7 @@ NetworkPortalDetectorImpl::NetworkPortalDetectorImpl(
|
|
|
| NetworkPortalDetectorImpl::~NetworkPortalDetectorImpl() {
|
| NET_LOG(EVENT) << "NetworkPortalDetectorImpl::~NetworkPortalDetectorImpl()";
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
|
|
| attempt_task_.Cancel();
|
| attempt_timeout_.Cancel();
|
| @@ -260,13 +260,13 @@ NetworkPortalDetectorImpl::~NetworkPortalDetectorImpl() {
|
| }
|
|
|
| void NetworkPortalDetectorImpl::AddObserver(Observer* observer) {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
| if (observer && !observers_.HasObserver(observer))
|
| observers_.AddObserver(observer);
|
| }
|
|
|
| void NetworkPortalDetectorImpl::AddAndFireObserver(Observer* observer) {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
| if (!observer)
|
| return;
|
| AddObserver(observer);
|
| @@ -278,7 +278,7 @@ void NetworkPortalDetectorImpl::AddAndFireObserver(Observer* observer) {
|
| }
|
|
|
| void NetworkPortalDetectorImpl::RemoveObserver(Observer* observer) {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
| if (observer)
|
| observers_.RemoveObserver(observer);
|
| }
|
| @@ -286,7 +286,7 @@ void NetworkPortalDetectorImpl::RemoveObserver(Observer* observer) {
|
| bool NetworkPortalDetectorImpl::IsEnabled() { return enabled_; }
|
|
|
| void NetworkPortalDetectorImpl::Enable(bool start_detection) {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
| if (enabled_)
|
| return;
|
|
|
| @@ -304,7 +304,7 @@ void NetworkPortalDetectorImpl::Enable(bool start_detection) {
|
|
|
| NetworkPortalDetectorImpl::CaptivePortalState
|
| NetworkPortalDetectorImpl::GetCaptivePortalState(const std::string& guid) {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
| CaptivePortalStateMap::const_iterator it = portal_state_map_.find(guid);
|
| if (it == portal_state_map_.end())
|
| return CaptivePortalState();
|
| @@ -334,7 +334,7 @@ void NetworkPortalDetectorImpl::OnLockScreenRequest() {
|
|
|
| void NetworkPortalDetectorImpl::DefaultNetworkChanged(
|
| const NetworkState* default_network) {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
|
|
| if (!default_network) {
|
| NET_LOG(EVENT) << "Default network changed: None";
|
| @@ -459,7 +459,7 @@ void NetworkPortalDetectorImpl::StartAttempt() {
|
| }
|
|
|
| void NetworkPortalDetectorImpl::OnAttemptTimeout() {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
| DCHECK(is_checking_for_portal());
|
|
|
| NET_LOG(ERROR) << "Portal detection timeout: "
|
| @@ -474,7 +474,7 @@ void NetworkPortalDetectorImpl::OnAttemptTimeout() {
|
|
|
| void NetworkPortalDetectorImpl::OnAttemptCompleted(
|
| const CaptivePortalDetector::Results& results) {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
| DCHECK(is_checking_for_portal());
|
|
|
| captive_portal::CaptivePortalResult result = results.result;
|
|
|