Make CriticalSectionWrapper non-virtual

webrtc/system_wrappers/include/critical_section_wrapper.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.
  */
 
 #ifndef WEBRTC_SYSTEM_WRAPPERS_INCLUDE_CRITICAL_SECTION_WRAPPER_H_
 #define WEBRTC_SYSTEM_WRAPPERS_INCLUDE_CRITICAL_SECTION_WRAPPER_H_
 
 // If the critical section is heavily contended it may be beneficial to use
 // read/write locks instead.
 
+#if defined (WEBRTC_WIN)
+#include <windows.h>
+#else
+#include <pthread.h>
+#endif
+
 #include "webrtc/base/thread_annotations.h"
 #include "webrtc/common_types.h"
 
 namespace webrtc {
+
 class LOCKABLE CriticalSectionWrapper {
  public:
   // Factory method, constructor disabled
+  // TODO(tommi): Remove this method.

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

The real TODO should imo be to nuke this file and use rtc::CriticalSection
instead.

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

Right... I'll see if we can get rid of the ConditionVariableWrapper class, which
is currently preventing us from doing that.  Comment updated.

   static CriticalSectionWrapper* CreateCriticalSection();
 
-  virtual ~CriticalSectionWrapper() {}
+  CriticalSectionWrapper();
+  ~CriticalSectionWrapper();
 
   // Tries to grab lock, beginning of a critical section. Will wait for the
   // lock to become available if the grab failed.
-  virtual void Enter() EXCLUSIVE_LOCK_FUNCTION() = 0;
+  void Enter() EXCLUSIVE_LOCK_FUNCTION();
 
   // Returns a grabbed lock, end of critical section.
-  virtual void Leave() UNLOCK_FUNCTION() = 0;
+  void Leave() UNLOCK_FUNCTION();
+
+private:
+#if defined (WEBRTC_WIN)
+  CRITICAL_SECTION crit_;
+
+  // TODO(tommi): Remove friendness.
+  friend class ConditionVariableEventWin;
+  friend class ConditionVariableNativeWin;
+#else
+  // TODO(tommi): Remove friendness.
+  pthread_mutex_t mutex_;
+  friend class ConditionVariablePosix;
+#endif
 };
 
 // RAII extension of the critical section. Prevents Enter/Leave mismatches and
 // provides more compact critical section syntax.
 class SCOPED_LOCKABLE CriticalSectionScoped {
  public:
   explicit CriticalSectionScoped(CriticalSectionWrapper* critsec)
       EXCLUSIVE_LOCK_FUNCTION(critsec)
       : ptr_crit_sec_(critsec) {
     ptr_crit_sec_->Enter();
   }
 
   ~CriticalSectionScoped() UNLOCK_FUNCTION() { ptr_crit_sec_->Leave(); }
 
  private:
   CriticalSectionWrapper* ptr_crit_sec_;
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_SYSTEM_WRAPPERS_INCLUDE_CRITICAL_SECTION_WRAPPER_H_