Remove XP Condition Variable Affordances

base/synchronization/condition_variable.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // ConditionVariable wraps pthreads condition variable synchronization or, on
 // Windows, simulates it.  This functionality is very helpful for having
 // several threads wait for an event, as is common with a thread pool managed
 // by a master.  The meaning of such an event in the (worker) thread pool
 // scenario is that additional tasks are now available for processing.  It is
 // used in Chrome in the DNS prefetching system to notify worker threads that
@@ skipping 57 matching lines @@
 #include "base/base_export.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/synchronization/lock.h"
 #include "build/build_config.h"
 
 #if defined(OS_POSIX)
 #include <pthread.h>
 #endif
 
+#if defined(OS_WIN)
+#include <windows.h>
+#endif
+
 namespace base {
 
-class ConditionVarImpl;
 class TimeDelta;
 
 class BASE_EXPORT ConditionVariable {
  public:
   // Construct a cv for use with ONLY one user lock.
   explicit ConditionVariable(Lock* user_lock);
 
   ~ConditionVariable();
 
   // Wait() releases the caller's critical section atomically as it starts to
   // sleep, and the reacquires it when it is signaled.
   void Wait();
   void TimedWait(const TimeDelta& max_time);
 
   // Broadcast() revives all waiting threads.
   void Broadcast();
   // Signal() revives one waiting thread.
   void Signal();
 
  private:
 
 #if defined(OS_WIN)
-  ConditionVarImpl* impl_;
+  CRITICAL_SECTION* const crit_sec_;

[scottmg, 2016/04/06 18:34:04]

nit; swap order to make win & posix match.

[robliao, 2016/04/06 19:22:18]

I would have done that, but it diverges from the init order :-/. 

We get the crit_sec_ via initialization list (since it's const here) and then we
make the InitializeConditionVariable call in the constructor body.

[robliao, 2016/04/06 19:24:53]

I guess we already do that with user_lock_. Hands up in the air! Done.

+  CONDITION_VARIABLE cv_;
 #elif defined(OS_POSIX)
   pthread_cond_t condition_;
   pthread_mutex_t* user_mutex_;
-#if DCHECK_IS_ON()
-  base::Lock* user_lock_;     // Needed to adjust shadow lock state on wait.
 #endif
 
+#if DCHECK_IS_ON() && (defined(OS_WIN) || defined(OS_POSIX))
+  base::Lock* const user_lock_;  // Needed to adjust shadow lock state on wait.
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(ConditionVariable);
 };
 
 }  // namespace base
 
 #endif  // BASE_SYNCHRONIZATION_CONDITION_VARIABLE_H_