| Index: components/scheduler/child/scheduler_task_runner_delegate_for_test.h
|
| diff --git a/components/scheduler/child/nestable_task_runner_for_test.h b/components/scheduler/child/scheduler_task_runner_delegate_for_test.h
|
| similarity index 50%
|
| copy from components/scheduler/child/nestable_task_runner_for_test.h
|
| copy to components/scheduler/child/scheduler_task_runner_delegate_for_test.h
|
| index 120fe0070e6de32f44c25b5d9912d8a60ded052d..d4a0545107216eed857f583708ca74f9ba74b92a 100644
|
| --- a/components/scheduler/child/nestable_task_runner_for_test.h
|
| +++ b/components/scheduler/child/scheduler_task_runner_delegate_for_test.h
|
| @@ -2,21 +2,23 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CONTENT_RENDERER_SCHEDULER_NESTABLE_TASK_RUNNER_FOR_TEST_H_
|
| -#define CONTENT_RENDERER_SCHEDULER_NESTABLE_TASK_RUNNER_FOR_TEST_H_
|
| +#ifndef CONTENT_RENDERER_SCHEDULER_TASK_RUNNER_DELEGATE_FOR_TEST_H_
|
| +#define CONTENT_RENDERER_SCHEDULER_TASK_RUNNER_DELEGATE_FOR_TEST_H_
|
|
|
| -#include "components/scheduler/child/nestable_single_thread_task_runner.h"
|
| +#include "components/scheduler/child/scheduler_task_runner_delegate.h"
|
|
|
| namespace scheduler {
|
|
|
| -class NestableTaskRunnerForTest : public NestableSingleThreadTaskRunner {
|
| +class NestableTaskRunnerForTest;
|
| +
|
| +class SchedulerTaskRunnerDelegateForTest : public SchedulerTaskRunnerDelegate {
|
| public:
|
| - static scoped_refptr<NestableTaskRunnerForTest> Create(
|
| + static scoped_refptr<SchedulerTaskRunnerDelegateForTest> Create(
|
| scoped_refptr<base::SingleThreadTaskRunner> task_runner);
|
|
|
| - void SetNested(bool is_nested);
|
| -
|
| - // NestableSingleThreadTaskRunner implementation
|
| + // SchedulerTaskRunnerDelegate implementation
|
| + void SetDefaultTaskRunner(
|
| + scoped_refptr<base::SingleThreadTaskRunner> task_runner) override;
|
| bool PostDelayedTask(const tracked_objects::Location& from_here,
|
| const base::Closure& task,
|
| base::TimeDelta delay) override;
|
| @@ -29,26 +31,24 @@ class NestableTaskRunnerForTest : public NestableSingleThreadTaskRunner {
|
| void RemoveTaskObserver(
|
| base::MessageLoop::TaskObserver* task_observer) override;
|
|
|
| + base::SingleThreadTaskRunner* default_task_runner() const {
|
| + return default_task_runner_.get();
|
| + }
|
| +
|
| protected:
|
| - ~NestableTaskRunnerForTest() override;
|
| + ~SchedulerTaskRunnerDelegateForTest() override;
|
|
|
| private:
|
| - NestableTaskRunnerForTest(
|
| + explicit SchedulerTaskRunnerDelegateForTest(
|
| scoped_refptr<base::SingleThreadTaskRunner> task_runner);
|
|
|
| - void WrapTask(const base::PendingTask* wrapped_task);
|
| -
|
| - scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
|
| - bool is_nested_;
|
| -
|
| - base::ObserverList<base::MessageLoop::TaskObserver> task_observers_;
|
| + scoped_refptr<base::SingleThreadTaskRunner> default_task_runner_;
|
|
|
| - base::WeakPtr<NestableTaskRunnerForTest> weak_nestable_task_runner_ptr_;
|
| - base::WeakPtrFactory<NestableTaskRunnerForTest> weak_factory_;
|
| + scoped_refptr<NestableTaskRunnerForTest> task_runner_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(NestableTaskRunnerForTest);
|
| + DISALLOW_COPY_AND_ASSIGN(SchedulerTaskRunnerDelegateForTest);
|
| };
|
|
|
| } // namespace scheduler
|
|
|
| -#endif // CONTENT_RENDERER_SCHEDULER_NESTABLE_TASK_RUNNER_FOR_TEST_H_
|
| +#endif // CONTENT_RENDERER_SCHEDULER_SCHEDULER_TASK_RUNNER_DELEGATE_FOR_TEST_H_
|
|
|