Convert usage of ARRAY_SIZE to arraysize.

talk/media/base/capturemanager_unittest.cc

 /*
  * libjingle
  * Copyright 2012 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 11 matching lines @@
  * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "talk/media/base/capturemanager.h"
 
 #include "talk/media/base/fakevideocapturer.h"
 #include "talk/media/base/fakevideorenderer.h"
+#include "webrtc/base/arraysize.h"
 #include "webrtc/base/gunit.h"
 #include "webrtc/base/sigslot.h"
 
 const int kMsCallbackWait = 50;
 
 const int kFps = 30;
 const cricket::VideoFormatPod kCameraFormats[] = {
   {640, 480, cricket::VideoFormat::FpsToInterval(kFps), cricket::FOURCC_I420},
   {320, 240, cricket::VideoFormat::FpsToInterval(kFps), cricket::FOURCC_I420}
 };
 
 class CaptureManagerTest : public ::testing::Test, public sigslot::has_slots<> {
  public:
   CaptureManagerTest()
       : capture_manager_(),
         callback_count_(0),
         format_vga_(kCameraFormats[0]),
         format_qvga_(kCameraFormats[1]) {
   }
   virtual void SetUp() {
     PopulateSupportedFormats();
     capture_state_ = cricket::CS_STOPPED;
     capture_manager_.SignalCapturerStateChange.connect(
         this,
         &CaptureManagerTest::OnCapturerStateChange);
   }
   void PopulateSupportedFormats() {
     std::vector<cricket::VideoFormat> formats;
-    for (int i = 0; i < ARRAY_SIZE(kCameraFormats); ++i) {
+    for (int i = 0; i < arraysize(kCameraFormats); ++i) {
       formats.push_back(cricket::VideoFormat(kCameraFormats[i]));
     }
     video_capturer_.ResetSupportedFormats(formats);
   }
   int NumFramesRendered() { return video_renderer_.num_rendered_frames(); }
   bool WasRenderedResolution(cricket::VideoFormat format) {
     return format.width == video_renderer_.width() &&
         format.height == video_renderer_.height();
   }
   cricket::CaptureState capture_state() { return capture_state_; }
@@ skipping 148 matching lines @@
   // Now request restart with qvga.
   EXPECT_TRUE(capture_manager_.RestartVideoCapture(
       &video_capturer_, format_vga_, format_qvga_,
       cricket::CaptureManager::kRequestRestart));
   EXPECT_TRUE(video_capturer_.CaptureFrame());
   EXPECT_EQ(2, NumFramesRendered());
   EXPECT_TRUE(WasRenderedResolution(format_vga_));
   EXPECT_TRUE(capture_manager_.StopVideoCapture(&video_capturer_,
                                                 format_qvga_));
 }