Deprecate NonThreadSafe in components/captive_portal in favor of SequenceChecker.

components/captive_portal/captive_portal_detector.h

 // 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.
 
 #ifndef COMPONENTS_CAPTIVE_PORTAL_CAPTIVE_PORTAL_DETECTOR_H_
 #define COMPONENTS_CAPTIVE_PORTAL_CAPTIVE_PORTAL_DETECTOR_H_
 
 #include <memory>
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "base/threading/non_thread_safe.h"
+#include "base/sequence_checker.h"
 #include "base/time/time.h"
 #include "components/captive_portal/captive_portal_export.h"
 #include "components/captive_portal/captive_portal_types.h"
 #include "net/traffic_annotation/network_traffic_annotation.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "net/url_request/url_request_context_getter.h"
 
 class GURL;
 
 namespace captive_portal {
 
 class CAPTIVE_PORTAL_EXPORT CaptivePortalDetector
-    : public net::URLFetcherDelegate,
-      public base::NonThreadSafe {
+    : public net::URLFetcherDelegate {
  public:
   struct Results {
     Results()
         : result(captive_portal::RESULT_NO_RESPONSE),
           response_code(net::URLFetcher::RESPONSE_CODE_INVALID) {
     }
 
     captive_portal::CaptivePortalResult result;
     int response_code;
     base::TimeDelta retry_after_delta;
@@ skipping 57 matching lines @@
   // URL request context.
   scoped_refptr<net::URLRequestContextGetter> request_context_;
 
   DetectionCallback detection_callback_;
 
   std::unique_ptr<net::URLFetcher> url_fetcher_;
 
   // Test time used by unit tests.
   base::Time time_for_testing_;
 
+  SEQUENCE_CHECKER(sequence_checker_);
+
   DISALLOW_COPY_AND_ASSIGN(CaptivePortalDetector);
 };
 
 }  // namespace captive_portal
 
 #endif  // COMPONENTS_CAPTIVE_PORTAL_CAPTIVE_PORTAL_DETECTOR_H_