| Index: base/test/test_pending_task.h
|
| diff --git a/base/test/test_pending_task.h b/base/test/test_pending_task.h
|
| index 2dbdb7eeccbdcc1927dca53114258f83eb06e477..42f3f42c7b4d180d03559c62e02683be73fc7343 100644
|
| --- a/base/test/test_pending_task.h
|
| +++ b/base/test/test_pending_task.h
|
| @@ -21,7 +21,7 @@ struct TestPendingTask {
|
| enum TestNestability { NESTABLE, NON_NESTABLE };
|
|
|
| TestPendingTask();
|
| - TestPendingTask(const TestPendingTask& other);
|
| + TestPendingTask(TestPendingTask&& other);
|
| TestPendingTask(const tracked_objects::Location& location,
|
| const Closure& task,
|
| TimeTicks post_time,
|
| @@ -29,6 +29,8 @@ struct TestPendingTask {
|
| TestNestability nestability);
|
| ~TestPendingTask();
|
|
|
| + TestPendingTask& operator=(TestPendingTask&& other);
|
| +
|
| // Returns post_time + delay.
|
| TimeTicks GetTimeToRun() const;
|
|
|
| @@ -51,7 +53,7 @@ struct TestPendingTask {
|
| bool ShouldRunBefore(const TestPendingTask& other) const;
|
|
|
| tracked_objects::Location location;
|
| - Closure task;
|
| + OnceClosure task;
|
| TimeTicks post_time;
|
| TimeDelta delay;
|
| TestNestability nestability;
|
| @@ -61,6 +63,9 @@ struct TestPendingTask {
|
| void AsValueInto(base::trace_event::TracedValue* state) const;
|
| std::unique_ptr<base::trace_event::ConvertableToTraceFormat> AsValue() const;
|
| std::string ToString() const;
|
| +
|
| + private:
|
| + DISALLOW_COPY_AND_ASSIGN(TestPendingTask);
|
| };
|
|
|
| // gtest helpers which allow pretty printing of the tasks, very useful in unit
|
|
|