Deprecate NonThreadSafe in components/sync in favor of SequenceChecker.

components/sync/engine_impl/attachments/attachment_uploader_impl_unittest.cc

Index: components/sync/engine_impl/attachments/attachment_uploader_impl_unittest.cc
diff --git a/components/sync/engine_impl/attachments/attachment_uploader_impl_unittest.cc b/components/sync/engine_impl/attachments/attachment_uploader_impl_unittest.cc
index cc226e8e32e7da57e46634cdc476912720a81d45..fd9e7f1047b8f8a78678eec9601d9e28c187c3a2 100644
--- a/components/sync/engine_impl/attachments/attachment_uploader_impl_unittest.cc
+++ b/components/sync/engine_impl/attachments/attachment_uploader_impl_unittest.cc
@@ -15,6 +15,7 @@
 #include "base/memory/ref_counted_memory.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
+#include "base/sequence_checker.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
@@ -144,8 +145,7 @@ void MockOAuth2TokenService::InvalidateAccessTokenImpl(
 }
 
 class TokenServiceProvider
-    : public OAuth2TokenServiceRequest::TokenServiceProvider,
-      base::NonThreadSafe {
+    : public OAuth2TokenServiceRequest::TokenServiceProvider {
  public:
   explicit TokenServiceProvider(OAuth2TokenService* token_service);
 
@@ -159,6 +159,8 @@ class TokenServiceProvider
 
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
   OAuth2TokenService* token_service_;
+
+  SEQUENCE_CHECKER(sequence_checker_);
 };
 
 TokenServiceProvider::TokenServiceProvider(OAuth2TokenService* token_service)
@@ -167,7 +169,9 @@ TokenServiceProvider::TokenServiceProvider(OAuth2TokenService* token_service)
   DCHECK(token_service_);
 }
 
-TokenServiceProvider::~TokenServiceProvider() {}
+TokenServiceProvider::~TokenServiceProvider() {
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+}
 
 scoped_refptr<base::SingleThreadTaskRunner>
 TokenServiceProvider::GetTokenServiceTaskRunner() {
@@ -183,13 +187,13 @@ OAuth2TokenService* TokenServiceProvider::GetTokenService() {
 //
 // This fixture provides an embedded HTTP server and a mock OAuth2 token service
 // for interacting with AttachmentUploaderImpl
-class AttachmentUploaderImplTest : public testing::Test,
-                                   public base::NonThreadSafe {
+class AttachmentUploaderImplTest : public testing::Test {
  public:
   void OnRequestReceived(const HttpRequest& request);
 
  protected:
   AttachmentUploaderImplTest();
+  ~AttachmentUploaderImplTest() override;
   void SetUp() override;
   void TearDown() override;
 
@@ -228,6 +232,8 @@ class AttachmentUploaderImplTest : public testing::Test,
   std::vector<AttachmentId> attachment_ids_;
   std::unique_ptr<MockOAuth2TokenService> token_service_;
 
+  SEQUENCE_CHECKER(sequence_checker_);
+
   // Must be last data member.
   base::WeakPtrFactory<AttachmentUploaderImplTest> weak_ptr_factory_;
 };
@@ -235,7 +241,7 @@ class AttachmentUploaderImplTest : public testing::Test,
 // Handles HTTP requests received by the EmbeddedTestServer.
 //
 // Responds with HTTP_OK by default.  See |SetStatusCode|.
-class RequestHandler : public base::NonThreadSafe {
+class RequestHandler {
  public:
   // Construct a RequestHandler that will PostTask to |test| using
   // |test_task_runner|.
@@ -260,18 +266,24 @@ class RequestHandler : public base::NonThreadSafe {
 
   scoped_refptr<base::SingleThreadTaskRunner> test_task_runner_;
   base::WeakPtr<AttachmentUploaderImplTest> test_;
+
+  SEQUENCE_CHECKER(sequence_checker_);
 };
 
 AttachmentUploaderImplTest::AttachmentUploaderImplTest()
     : weak_ptr_factory_(this) {}
 
+AttachmentUploaderImplTest::~AttachmentUploaderImplTest() {
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+}
+
 void AttachmentUploaderImplTest::OnRequestReceived(const HttpRequest& request) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   http_requests_received_.push_back(request);
 }
 
 void AttachmentUploaderImplTest::SetUp() {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   request_handler_ = base::MakeUnique<RequestHandler>(
       message_loop_.task_runner(), weak_ptr_factory_.GetWeakPtr());
   url_request_context_getter_ =
@@ -359,7 +371,7 @@ RequestHandler& AttachmentUploaderImplTest::request_handler() {
 void AttachmentUploaderImplTest::UploadDone(
     const AttachmentUploader::UploadResult& result,
     const AttachmentId& attachment_id) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   upload_results_.push_back(result);
   attachment_ids_.push_back(attachment_id);
   DCHECK(!signal_upload_done_.is_null());
@@ -372,16 +384,14 @@ RequestHandler::RequestHandler(
     : status_code_(net::HTTP_OK),
       test_task_runner_(test_task_runner),
       test_(test) {
-  DetachFromThread();
+  DETACH_FROM_SEQUENCE(sequence_checker_);
 }
 
-RequestHandler::~RequestHandler() {
-  DetachFromThread();
-}
+RequestHandler::~RequestHandler() = default;
 
 std::unique_ptr<HttpResponse> RequestHandler::HandleRequest(
     const HttpRequest& request) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   test_task_runner_->PostTask(
       FROM_HERE, base::Bind(&AttachmentUploaderImplTest::OnRequestReceived,
                             test_, request));