Make CriticalSectionWrapper non-virtual

webrtc/modules/audio_coding/neteq/neteq_network_stats_unittest.cc

 /*
  *  Copyright (c) 2015 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 67 matching lines @@
   bool fec_enabled_;
 };
 
 class NetEqNetworkStatsTest : public NetEqExternalDecoderTest {
  public:
   static const int kPayloadSizeByte = 30;
   static const int kFrameSizeMs = 20;
   static const int kMaxOutputSize = 960;  // 10 ms * 48 kHz * 2 channels.
 
 enum logic {
-  IGNORE,
-  EQUAL,
-  SMALLER_THAN,
-  LARGER_THAN,
+  kIgnore,
+  kEqual,
+  kSmallerThan,
+  kLargerThan,
 };
 
 struct NetEqNetworkStatsCheck {
   logic current_buffer_size_ms;
   logic preferred_buffer_size_ms;
   logic jitter_peaks_found;
   logic packet_loss_rate;
   logic packet_discard_rate;
   logic expand_rate;
   logic speech_expand_rate;
@@ skipping 34 matching lines @@
   // expects.x = -1, do not care
   // expects.x = 0, 'x' in current stats should equal 'x' in |stats_ref|
   // expects.x = 1, 'x' in current stats should < 'x' in |stats_ref|
   // expects.x = 2, 'x' in current stats should > 'x' in |stats_ref|
   void CheckNetworkStatistics(NetEqNetworkStatsCheck expects) {
     NetEqNetworkStatistics stats;
     neteq()->NetworkStatistics(&stats);
 
 #define CHECK_NETEQ_NETWORK_STATS(x)\
   switch (expects.x) {\
-    case EQUAL:\
+    case kEqual:\
       EXPECT_EQ(stats.x, expects.stats_ref.x);\
       break;\
-    case SMALLER_THAN:\
+    case kSmallerThan:\
       EXPECT_LT(stats.x, expects.stats_ref.x);\
       break;\
-    case LARGER_THAN:\
+    case kLargerThan:\
       EXPECT_GT(stats.x, expects.stats_ref.x);\
       break;\
     default:\
       break;\
   }
 
     CHECK_NETEQ_NETWORK_STATS(current_buffer_size_ms);
     CHECK_NETEQ_NETWORK_STATS(preferred_buffer_size_ms);
     CHECK_NETEQ_NETWORK_STATS(jitter_peaks_found);
     CHECK_NETEQ_NETWORK_STATS(packet_loss_rate);
@@ skipping 34 matching lines @@
       GetOutputAudio(kMaxOutputSize, output_, &output_type);
       time_now += kOutputLengthMs;
     }
     CheckNetworkStatistics(expects);
     neteq()->FlushBuffers();
   }
 
   void DecodeFecTest() {
     external_decoder_->set_fec_enabled(false);
     NetEqNetworkStatsCheck expects = {
-      IGNORE,  // current_buffer_size_ms
-      IGNORE,  // preferred_buffer_size_ms
-      IGNORE,  // jitter_peaks_found
-      EQUAL,  // packet_loss_rate
-      EQUAL,  // packet_discard_rate
-      EQUAL,  // expand_rate
-      EQUAL,  // voice_expand_rate
-      IGNORE,  // preemptive_rate
-      EQUAL,  // accelerate_rate
-      EQUAL,  // decoded_fec_rate
-      IGNORE,  // clockdrift_ppm
-      EQUAL,  // added_zero_samples
+      kIgnore,  // current_buffer_size_ms
+      kIgnore,  // preferred_buffer_size_ms
+      kIgnore,  // jitter_peaks_found
+      kEqual,  // packet_loss_rate
+      kEqual,  // packet_discard_rate
+      kEqual,  // expand_rate
+      kEqual,  // voice_expand_rate
+      kIgnore,  // preemptive_rate
+      kEqual,  // accelerate_rate
+      kEqual,  // decoded_fec_rate
+      kIgnore,  // clockdrift_ppm
+      kEqual,  // added_zero_samples
       {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
     };
     RunTest(50, expects);
 
     // Next we introduce packet losses.
     SetPacketLossRate(0.1);
     expects.stats_ref.packet_loss_rate = 1337;
     expects.stats_ref.expand_rate = expects.stats_ref.speech_expand_rate = 1065;
     RunTest(50, expects);
 
     // Next we enable FEC.
     external_decoder_->set_fec_enabled(true);
     // If FEC fills in the lost packets, no packet loss will be counted.
     expects.stats_ref.packet_loss_rate = 0;
     expects.stats_ref.expand_rate = expects.stats_ref.speech_expand_rate = 0;
     expects.stats_ref.secondary_decoded_rate = 2006;
     RunTest(50, expects);
   }
 
   void NoiseExpansionTest() {
     NetEqNetworkStatsCheck expects = {
-      IGNORE,  // current_buffer_size_ms
-      IGNORE,  // preferred_buffer_size_ms
-      IGNORE,  // jitter_peaks_found
-      EQUAL,  // packet_loss_rate
-      EQUAL,  // packet_discard_rate
-      EQUAL,  // expand_rate
-      EQUAL,  // speech_expand_rate
-      IGNORE,  // preemptive_rate
-      EQUAL,  // accelerate_rate
-      EQUAL,  // decoded_fec_rate
-      IGNORE,  // clockdrift_ppm
-      EQUAL,  // added_zero_samples
+      kIgnore,  // current_buffer_size_ms
+      kIgnore,  // preferred_buffer_size_ms
+      kIgnore,  // jitter_peaks_found
+      kEqual,  // packet_loss_rate
+      kEqual,  // packet_discard_rate
+      kEqual,  // expand_rate
+      kEqual,  // speech_expand_rate
+      kIgnore,  // preemptive_rate
+      kEqual,  // accelerate_rate
+      kEqual,  // decoded_fec_rate
+      kIgnore,  // clockdrift_ppm
+      kEqual,  // added_zero_samples
       {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
     };
     RunTest(50, expects);
 
     SetPacketLossRate(1);
     expects.stats_ref.expand_rate = 16384;
     expects.stats_ref.speech_expand_rate = 5324;
     RunTest(10, expects);  // Lost 10 * 20ms in a row.
   }
 
@@ skipping 29 matching lines @@
   test.NoiseExpansionTest();
   EXPECT_CALL(decoder, Die()).Times(1);
 }
 
 }  // namespace test
 }  // namespace webrtc