Convert usage of ARRAY_SIZE to arraysize.

talk/media/base/testutils.h

 /*
  * libjingle
  * Copyright 2004 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 17 matching lines @@
 #ifndef TALK_MEDIA_BASE_TESTUTILS_H_
 #define TALK_MEDIA_BASE_TESTUTILS_H_
 
 #include <string>
 #include <vector>
 
 #include "libyuv/compare.h"
 #include "talk/media/base/mediachannel.h"
 #include "talk/media/base/videocapturer.h"
 #include "talk/media/base/videocommon.h"
+#include "webrtc/base/arraysize.h"
 #include "webrtc/base/basictypes.h"
 #include "webrtc/base/sigslot.h"
 #include "webrtc/base/window.h"
 
 namespace rtc {
 class ByteBuffer;
 class StreamInterface;
 }
 
 namespace cricket {
 
 // Returns size of 420 image with rounding on chroma for odd sizes.
 #define I420_SIZE(w, h) (w * h + (((w + 1) / 2) * ((h + 1) / 2)) * 2)
 // Returns size of ARGB image.
 #define ARGB_SIZE(w, h) (w * h * 4)
 
 template <class T> inline std::vector<T> MakeVector(const T a[], size_t s) {
   return std::vector<T>(a, a + s);
 }
-#define MAKE_VECTOR(a) cricket::MakeVector(a, ARRAY_SIZE(a))
+#define MAKE_VECTOR(a) cricket::MakeVector(a, arraysize(a))
 
 struct RtpDumpPacket;
 class RtpDumpWriter;
 class VideoFrame;
 
 struct RawRtpPacket {
   void WriteToByteBuffer(uint32_t in_ssrc, rtc::ByteBuffer* buf) const;
   bool ReadFromByteBuffer(rtc::ByteBuffer* buf);
   // Check if this packet is the same as the specified packet except the
   // sequence number and timestamp, which should be the same as the specified
@@ skipping 171 matching lines @@
 // Create Simulcast stream with given |ssrcs| and |rtx_ssrcs|.
 // The number of |rtx_ssrcs| must match number of |ssrcs|.
 cricket::StreamParams CreateSimWithRtxStreamParams(
     const std::string& cname,
     const std::vector<uint32_t>& ssrcs,
     const std::vector<uint32_t>& rtx_ssrcs);
 
 }  // namespace cricket
 
 #endif  // TALK_MEDIA_BASE_TESTUTILS_H_