ThreadChecker instead of SequenceChecker in classes that use TLS.

content/child/fileapi/webfilesystem_impl.cc

 // Copyright 2013 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 "content/child/fileapi/webfilesystem_impl.h"
 
 #include <stddef.h>
 #include <tuple>
 
 #include "base/bind.h"
@@ skipping 79 matching lines @@
   if (ChildThreadImpl::current())
     ChildThreadImpl::current()->Send(
         new FileSystemHostMsg_DidReceiveSnapshotFile(request_id));
 }
 
 template <typename Method, typename Params>
 void CallDispatcherOnMainThread(
     const scoped_refptr<base::SingleThreadTaskRunner>& main_thread_task_runner,
     Method method, const Params& params,
     WaitableCallbackResults* waitable_results) {
-  if (!main_thread_task_runner->RunsTasksInCurrentSequence()) {
+  if (!main_thread_task_runner->BelongsToCurrentThread()) {
     main_thread_task_runner->PostTask(
         FROM_HERE,
         base::Bind(&CallDispatcherOnMainThread<Method, Params>,
                    main_thread_task_runner, method, params, nullptr));
     if (!waitable_results)
       return;
     waitable_results->WaitAndRun();
   }
   if (!ChildThreadImpl::current() ||
       !ChildThreadImpl::current()->file_system_dispatcher())
@@ skipping 279 matching lines @@
 }
 
 WebFileSystemImpl::WebFileSystemImpl(
     const scoped_refptr<base::SingleThreadTaskRunner>& main_thread_task_runner)
     : main_thread_task_runner_(main_thread_task_runner),
       next_callbacks_id_(1) {
   g_webfilesystem_tls.Pointer()->Set(this);
 }
 
 WebFileSystemImpl::~WebFileSystemImpl() {
-  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
   g_webfilesystem_tls.Pointer()->Set(NULL);
 }
 
 void WebFileSystemImpl::WillStopCurrentWorkerThread() {
   delete this;
 }
 
 void WebFileSystemImpl::OpenFileSystem(const blink::WebURL& storage_partition,
                                        blink::WebFileSystemType type,
                                        WebFileSystemCallbacks callbacks) {
@@ skipping 237 matching lines @@
       waitable_results_.find(callbacksId);
   if (found == waitable_results_.end())
     return false;
 
   found->second->WaitAndRun();
   return true;
 }
 
 int WebFileSystemImpl::RegisterCallbacks(
     const WebFileSystemCallbacks& callbacks) {
-  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
   int id = next_callbacks_id_++;
   callbacks_[id] = callbacks;
   return id;
 }
 
 WebFileSystemCallbacks WebFileSystemImpl::GetCallbacks(int callbacks_id) {
-  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
   CallbacksMap::iterator found = callbacks_.find(callbacks_id);
   DCHECK(found != callbacks_.end());
   return found->second;
 }
 
 void WebFileSystemImpl::UnregisterCallbacks(int callbacks_id) {
-  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
   CallbacksMap::iterator found = callbacks_.find(callbacks_id);
   DCHECK(found != callbacks_.end());
   callbacks_.erase(found);
 
   waitable_results_.erase(callbacks_id);
 }
 
 WaitableCallbackResults* WebFileSystemImpl::MaybeCreateWaitableResults(
     const WebFileSystemCallbacks& callbacks, int callbacks_id) {
   if (!callbacks.ShouldBlockUntilCompletion())
     return NULL;
   WaitableCallbackResults* results = new WaitableCallbackResults();
   waitable_results_[callbacks_id] = results;
   return results;
 }
 
 }  // namespace content