Replace deprecated base::NonThreadSafe in google_apis/gaia in favor of SequenceChecker.

google_apis/gaia/oauth2_token_service_request.h

 // Copyright 2014 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 GOOGLE_APIS_GAIA_OAUTH2_TOKEN_SERVICE_REQUEST_H_
 #define GOOGLE_APIS_GAIA_OAUTH2_TOKEN_SERVICE_REQUEST_H_
 
 #include <memory>
 #include <set>
 #include <string>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
+#include "base/sequence_checker.h"
 #include "base/single_thread_task_runner.h"
-#include "base/threading/non_thread_safe.h"
 #include "google_apis/gaia/oauth2_token_service.h"
 
 // OAuth2TokenServiceRequest represents an asynchronous request to an
 // OAuth2TokenService that may live in another thread.
 //
 // An OAuth2TokenServiceRequest can be created and started from any thread.
-class OAuth2TokenServiceRequest : public OAuth2TokenService::Request,
-                                  public base::NonThreadSafe {
+class OAuth2TokenServiceRequest : public OAuth2TokenService::Request {
  public:
   class Core;
 
   // Interface for providing an OAuth2TokenService.
   //
   // Ref-counted so that OAuth2TokenServiceRequest can ensure this object isn't
   // destroyed out from under the token service task runner thread.  Because
   // OAuth2TokenServiceRequest has a reference, implementations of
   // TokenServiceProvider must be capable of being destroyed on the same thread
   // on which the OAuth2TokenServiceRequest was created.
@@ skipping 60 matching lines @@
   std::string GetAccountId() const override;
 
  private:
   OAuth2TokenServiceRequest(const std::string& account_id);
 
   void StartWithCore(const scoped_refptr<Core>& core);
 
   const std::string account_id_;
   scoped_refptr<Core> core_;
 
+  SEQUENCE_CHECKER(sequence_checker_);
+
   DISALLOW_COPY_AND_ASSIGN(OAuth2TokenServiceRequest);
 };
 
 #endif  // GOOGLE_APIS_GAIA_OAUTH2_TOKEN_SERVICE_REQUEST_H_