| Index: base/threading/thread_task_runner_handle.cc
|
| diff --git a/base/threading/thread_task_runner_handle.cc b/base/threading/thread_task_runner_handle.cc
|
| index 1b7c13a750c9936b98aae2905558a29e736b4478..5448c3e6a39398a6b20cdec3b44c61d1c69cbb02 100644
|
| --- a/base/threading/thread_task_runner_handle.cc
|
| +++ b/base/threading/thread_task_runner_handle.cc
|
| @@ -6,47 +6,14 @@
|
|
|
| #include <utility>
|
|
|
| -#include "base/lazy_instance.h"
|
| -#include "base/logging.h"
|
| #include "base/single_thread_task_runner.h"
|
| -#include "base/threading/sequenced_task_runner_handle.h"
|
| -#include "base/threading/thread_local.h"
|
|
|
| namespace base {
|
|
|
| -namespace {
|
| -
|
| -base::LazyInstance<base::ThreadLocalPointer<ThreadTaskRunnerHandle>>::Leaky
|
| - lazy_tls_ptr = LAZY_INSTANCE_INITIALIZER;
|
| -
|
| -} // namespace
|
| -
|
| -// static
|
| -scoped_refptr<SingleThreadTaskRunner> ThreadTaskRunnerHandle::Get() {
|
| - ThreadTaskRunnerHandle* current = lazy_tls_ptr.Pointer()->Get();
|
| - DCHECK(current);
|
| - return current->task_runner_;
|
| -}
|
| -
|
| -// static
|
| -bool ThreadTaskRunnerHandle::IsSet() {
|
| - return !!lazy_tls_ptr.Pointer()->Get();
|
| -}
|
| -
|
| ThreadTaskRunnerHandle::ThreadTaskRunnerHandle(
|
| scoped_refptr<SingleThreadTaskRunner> task_runner)
|
| - : task_runner_(std::move(task_runner)) {
|
| - DCHECK(task_runner_->BelongsToCurrentThread());
|
| - // No SequencedTaskRunnerHandle (which includes ThreadTaskRunnerHandles)
|
| - // should already be set for this thread.
|
| - DCHECK(!SequencedTaskRunnerHandle::IsSet());
|
| - lazy_tls_ptr.Pointer()->Set(this);
|
| -}
|
| + : task_scope_(std::move(task_runner)) {}
|
|
|
| -ThreadTaskRunnerHandle::~ThreadTaskRunnerHandle() {
|
| - DCHECK(task_runner_->BelongsToCurrentThread());
|
| - DCHECK_EQ(lazy_tls_ptr.Pointer()->Get(), this);
|
| - lazy_tls_ptr.Pointer()->Set(nullptr);
|
| -}
|
| +ThreadTaskRunnerHandle::~ThreadTaskRunnerHandle() = default;
|
|
|
| } // namespace base
|
|
|