Make CriticalSectionWrapper non-virtual

webrtc/modules/audio_coding/neteq/neteq_network_stats_unittest.cc

Index: webrtc/modules/audio_coding/neteq/neteq_network_stats_unittest.cc
diff --git a/webrtc/modules/audio_coding/neteq/neteq_network_stats_unittest.cc b/webrtc/modules/audio_coding/neteq/neteq_network_stats_unittest.cc
index 34ca9ea8567dcd866b9674b8d80320121e365278..fb4be862aec55c874e1574ffb956808d88f41847 100644
--- a/webrtc/modules/audio_coding/neteq/neteq_network_stats_unittest.cc
+++ b/webrtc/modules/audio_coding/neteq/neteq_network_stats_unittest.cc
@@ -84,6 +84,12 @@ class NetEqNetworkStatsTest : public NetEqExternalDecoderTest {
   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,