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 66 matching lines @@
   const size_t num_channels_;
   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.
 
+#if defined(WEBRTC_WIN)
+// 'IGNORE' is defined in winbase.h, so we'll hit a compilation issue
+// if we don't undef this macro before using the name in the logic enum.
+#undef IGNORE
+#endif
+
 enum logic {

[pbos-webrtc, 2016/01/19 13:04:41]

Can we rename the enum in here instead? Pref kIgnore, kEqual...

[tommi, 2016/01/19 13:57:15]

Done.

   IGNORE,
   EQUAL,
   SMALLER_THAN,
   LARGER_THAN,
 };
 
 struct NetEqNetworkStatsCheck {
   logic current_buffer_size_ms;
   logic preferred_buffer_size_ms;
   logic jitter_peaks_found;
@@ skipping 193 matching lines @@
   test.NoiseExpansionTest();
   EXPECT_CALL(decoder, Die()).Times(1);
 }
 
 }  // namespace test
 }  // namespace webrtc