| Index: webrtc/base/task_unittest.cc
|
| diff --git a/webrtc/base/task_unittest.cc b/webrtc/base/task_unittest.cc
|
| index a9cb7046e128561c5b71154fc9d76d3514aa6bad..1135a73a0f5307d98f739373a0c81afedeccbae2 100644
|
| --- a/webrtc/base/task_unittest.cc
|
| +++ b/webrtc/base/task_unittest.cc
|
| @@ -18,7 +18,7 @@
|
|
|
| #if defined(WEBRTC_WIN)
|
| #include "webrtc/base/win32.h"
|
| -#endif // WEBRTC_WIN
|
| +#endif // WEBRTC_WIN
|
|
|
| #include "webrtc/base/common.h"
|
| #include "webrtc/base/gunit.h"
|
| @@ -270,7 +270,7 @@ class TaskTest : public sigslot::has_slots<> {
|
| EXPECT_TRUE(stuck_[i].timed_out_);
|
| if (!stuck_[i].timed_out_) {
|
| std::cout << "Stuck task #" << i << " timeout is at "
|
| - << stuck_[i].task_->timeout_time() << std::endl;
|
| + << stuck_[i].task_->timeout_time() << std::endl;
|
| }
|
| }
|
|
|
| @@ -308,7 +308,7 @@ class AbortTask : public Task {
|
| return STATE_NEXT;
|
| }
|
| private:
|
| - DISALLOW_COPY_AND_ASSIGN(AbortTask);
|
| + RTC_DISALLOW_COPY_AND_ASSIGN(AbortTask);
|
| };
|
|
|
| class TaskAbortTest : public sigslot::has_slots<> {
|
| @@ -333,7 +333,7 @@ class TaskAbortTest : public sigslot::has_slots<> {
|
| }
|
|
|
| MyTaskRunner task_runner_;
|
| - DISALLOW_COPY_AND_ASSIGN(TaskAbortTest);
|
| + RTC_DISALLOW_COPY_AND_ASSIGN(TaskAbortTest);
|
| };
|
|
|
| TEST(start_task_test, Abort) {
|
| @@ -363,7 +363,7 @@ class SetBoolOnDeleteTask : public Task {
|
|
|
| private:
|
| bool* set_when_deleted_;
|
| - DISALLOW_COPY_AND_ASSIGN(SetBoolOnDeleteTask);
|
| + RTC_DISALLOW_COPY_AND_ASSIGN(SetBoolOnDeleteTask);
|
| };
|
|
|
| class AbortShouldWakeTest : public sigslot::has_slots<> {
|
| @@ -396,7 +396,7 @@ class AbortShouldWakeTest : public sigslot::has_slots<> {
|
| }
|
|
|
| MyTaskRunner task_runner_;
|
| - DISALLOW_COPY_AND_ASSIGN(AbortShouldWakeTest);
|
| + RTC_DISALLOW_COPY_AND_ASSIGN(AbortShouldWakeTest);
|
| };
|
|
|
| TEST(start_task_test, AbortShouldWake) {
|
| @@ -477,7 +477,7 @@ class TimeoutChangeTest : public sigslot::has_slots<> {
|
| MyTaskRunner task_runner_;
|
| StuckTask* (stuck_tasks_[3]);
|
| int task_count_;
|
| - DISALLOW_COPY_AND_ASSIGN(TimeoutChangeTest);
|
| + RTC_DISALLOW_COPY_AND_ASSIGN(TimeoutChangeTest);
|
| };
|
|
|
| TEST(start_task_test, TimeoutChange) {
|
| @@ -494,7 +494,7 @@ class DeleteTestTaskRunner : public TaskRunner {
|
| return GetCurrentTime();
|
| }
|
| private:
|
| - DISALLOW_COPY_AND_ASSIGN(DeleteTestTaskRunner);
|
| + RTC_DISALLOW_COPY_AND_ASSIGN(DeleteTestTaskRunner);
|
| };
|
|
|
| TEST(unstarted_task_test, DeleteTask) {
|
|
|