Convert usage of ARRAY_SIZE to arraysize.

webrtc/base/task_unittest.cc

 /*
  *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #if defined(WEBRTC_POSIX)
 #include <sys/time.h>
 #endif  // WEBRTC_POSIX
 
 // TODO: Remove this once the cause of sporadic failures in these
 // tests is tracked down.
 #include <iostream>
 
 #if defined(WEBRTC_WIN)
 #include "webrtc/base/win32.h"
 #endif  // WEBRTC_WIN
 
+#include "webrtc/base/arraysize.h"
 #include "webrtc/base/common.h"
 #include "webrtc/base/gunit.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/task.h"
 #include "webrtc/base/taskrunner.h"
 #include "webrtc/base/thread.h"
 #include "webrtc/base/timeutils.h"
 #include "webrtc/test/testsupport/gtest_disable.h"
 
 namespace rtc {
@@ skipping 368 matching lines @@
   AbortShouldWakeTest abort_should_wake_test;
   abort_should_wake_test.Start();
 }
 
 // Validate that TaskRunner's OnTimeoutChange gets called appropriately
 //  * When a task calls UpdateTaskTimeout
 //  * When the next timeout task time, times out
 class TimeoutChangeTest : public sigslot::has_slots<> {
  public:
   TimeoutChangeTest()
-    : task_count_(ARRAY_SIZE(stuck_tasks_)) {}
+    : task_count_(arraysize(stuck_tasks_)) {}
 
   // no need to delete any tasks; the task runner owns them
   ~TimeoutChangeTest() {}
 
   void Start() {
     for (int i = 0; i < task_count_; ++i) {
       stuck_tasks_[i] = new StuckTask(&task_runner_);
       stuck_tasks_[i]->set_timeout_seconds(i + 2);
       stuck_tasks_[i]->SignalTimeoutId.connect(this,
                                                &TimeoutChangeTest::OnTimeoutId);
@@ skipping 34 matching lines @@
         // the smallest timeout is now in the past.
         EXPECT_TRUE(task_runner_.timeout_change());
         task_runner_.clear_timeout_change();
       }
       Thread::Current()->socketserver()->Wait(500, false);
     }
   }
 
  private:
   void OnTimeoutId(const int id) {
-    for (int i = 0; i < ARRAY_SIZE(stuck_tasks_); ++i) {
+    for (size_t i = 0; i < arraysize(stuck_tasks_); ++i) {
       if (stuck_tasks_[i] && stuck_tasks_[i]->unique_id() == id) {
         task_count_--;
         stuck_tasks_[i] = NULL;
         break;
       }
     }
   }
 
   MyTaskRunner task_runner_;
   StuckTask* (stuck_tasks_[3]);
@@ skipping 56 matching lines @@
   // Do not start the task.
   // Note: this leaks memory, so don't do this.
   // Instead, always run your tasks or delete them.
   new HappyTask(happy_task);
 
   // run the unblocked tasks
   task_runner.RunTasks();
 }
 
 }  // namespace rtc