Deprecate NonThreadSafe in components/captive_portal in favor of SequenceChecker.

components/captive_portal/captive_portal_detector.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/captive_portal/captive_portal_detector.h"
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "components/data_use_measurement/core/data_use_user_data.h"
 #include "net/base/load_flags.h"
 #include "net/http/http_response_headers.h"
 #include "net/http/http_util.h"
 #include "net/url_request/url_request_status.h"
 
 namespace captive_portal {
 
 const char CaptivePortalDetector::kDefaultURL[] =
     "http://www.gstatic.com/generate_204";
 
 CaptivePortalDetector::CaptivePortalDetector(
     const scoped_refptr<net::URLRequestContextGetter>& request_context)
     : request_context_(request_context) {
 }
 
 CaptivePortalDetector::~CaptivePortalDetector() {
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 }
 
 void CaptivePortalDetector::DetectCaptivePortal(
     const GURL& url,
     const DetectionCallback& detection_callback,
     const net::NetworkTrafficAnnotationTag& traffic_annotation) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   DCHECK(!FetchingURL());
   DCHECK(detection_callback_.is_null());
 
   detection_callback_ = detection_callback;
 
   // The first 0 means this can use a TestURLFetcherFactory in unit tests.
   url_fetcher_ = net::URLFetcher::Create(0, url, net::URLFetcher::GET, this,
                                          traffic_annotation);
   url_fetcher_->SetAutomaticallyRetryOn5xx(false);
   url_fetcher_->SetRequestContext(request_context_.get());
@@ skipping 10 matching lines @@
       net::LOAD_DO_NOT_SEND_AUTH_DATA);
   url_fetcher_->Start();
 }
 
 void CaptivePortalDetector::Cancel() {
   url_fetcher_.reset();
   detection_callback_.Reset();
 }
 
 void CaptivePortalDetector::OnURLFetchComplete(const net::URLFetcher* source) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   DCHECK(FetchingURL());
   DCHECK_EQ(url_fetcher_.get(), source);
   DCHECK(!detection_callback_.is_null());
 
   Results results;
   GetCaptivePortalResultFromResponse(url_fetcher_.get(), &results);
   DetectionCallback callback = detection_callback_;
   url_fetcher_.reset();
   detection_callback_.Reset();
   callback.Run(results);
@@ skipping 69 matching lines @@
     return base::Time::Now();
   else
     return time_for_testing_;
 }
 
 bool CaptivePortalDetector::FetchingURL() const {
   return url_fetcher_.get() != NULL;
 }
 
 }  // namespace captive_portal