Move one CircularBuffer to webrtc::test namespace.

webrtc/modules/audio_coding/test/utility.h

 /*
  *  Copyright (c) 2011 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.
  */
 
@@ skipping 65 matching lines @@
 
  private:
   void Adjust();
 
   unsigned short _msec;
   unsigned char _sec;
   unsigned char _min;
   unsigned long _hour;
 };
 
+// To avoid clashes with CircularBuffer in APM.
+namespace test {
+
 class CircularBuffer {
  public:
   CircularBuffer(uint32_t len);
   ~CircularBuffer();
 
   void SetArithMean(bool enable);
   void SetVariance(bool enable);
 
   void Update(const double newVal);
   void IsBufferFull();
 
   int16_t Variance(double& var);
   int16_t ArithMean(double& mean);
 
  protected:
   double* _buff;
   uint32_t _idx;
   uint32_t _buffLen;
 
   bool _buffIsFull;
   bool _calcAvg;
   bool _calcVar;
   double _sum;
   double _sumSqr;
 };
 
+}  // namespace test
+
 int16_t ChooseCodec(CodecInst& codecInst);
 
 void PrintCodecs();
 
 bool FixedPayloadTypeCodec(const char* payloadName);
 
 class VADCallback : public ACMVADCallback {
  public:
   VADCallback();
 
   int32_t InFrameType(FrameType frame_type) override;
 
   void PrintFrameTypes();
   void Reset();
 
  private:
   uint32_t _numFrameTypes[5];
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_AUDIO_CODING_TEST_UTILITY_H_