Rename RWLockGeneric to RWLockWinXP to more accurately reflect when it's used.

webrtc/system_wrappers/source/rw_lock_winxp_win.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_SOURCE_RW_LOCK_GENERIC_H_
-#define WEBRTC_SYSTEM_WRAPPERS_SOURCE_RW_LOCK_GENERIC_H_
+#ifndef WEBRTC_SYSTEM_WRAPPERS_SOURCE_RW_LOCK_WINXP_WIN_H_
+#define WEBRTC_SYSTEM_WRAPPERS_SOURCE_RW_LOCK_WINXP_WIN_H_
 
+#include <windows.h>

[mflodman, 2016/01/19 09:55:32]

We shouldn't need this include here.

[tommi, 2016/01/19 10:03:07]

Done.

 #include "webrtc/system_wrappers/include/rw_lock_wrapper.h"
+#include "webrtc/system_wrappers/source/condition_variable_event_win.h"
+#include "webrtc/system_wrappers/source/critical_section_win.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
 
-class CriticalSectionWrapper;
-class ConditionVariableWrapper;
-
-class RWLockGeneric : public RWLockWrapper {
+class RWLockWinXP : public RWLockWrapper {
  public:
-  RWLockGeneric();
-  ~RWLockGeneric() override;
+  RWLockWinXP();
+  ~RWLockWinXP() override;
 
   void AcquireLockExclusive() override;
   void ReleaseLockExclusive() override;
 
   void AcquireLockShared() override;
   void ReleaseLockShared() override;
 
  private:
-  CriticalSectionWrapper* critical_section_;
-  ConditionVariableWrapper* read_condition_;
-  ConditionVariableWrapper* write_condition_;
+  CriticalSectionWindows critical_section_;
+  ConditionVariableEventWin read_condition_;
+  ConditionVariableEventWin write_condition_;
 
-  int readers_active_;
-  bool writer_active_;
-  int readers_waiting_;
-  int writers_waiting_;
+  int readers_active_ = 0;
+  bool writer_active_ = false;
+  int readers_waiting_ = 0;
+  int writers_waiting_ = 0;
 };
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_SYSTEM_WRAPPERS_SOURCE_RW_LOCK_GENERIC_H_
+#endif  // WEBRTC_SYSTEM_WRAPPERS_SOURCE_RW_LOCK_WINXP_WIN_H_