Move windows specific lock-recursion-counter into windows impl file

Unix implementation of lock leaks the underlying lock_impl_ member
so that the condition variable implementation can directly acquire
and release the lock (without going through our abstract interface). This
causse the recursion counter to become incorrect on such platforms.

Windows uses an implementation of condition variables that uses our abstract
interface, and hence is the only implementation that can track the
recursion count (and besides... windows is the only platform that currently
allows recursive (multiple) acquisitions of a lock by a single thread.

I'll work on gracefully removing the depricated lock.cc
after I've landed this change.

r=cpu
Review URL: http://codereview.chromium.org/7660

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3703 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 0 deletions

diff --git a/base/lock_impl.h b/base/lock_impl.h
index 4bd27dc..b3b6237 100644
--- a/base/lock_impl.h
+++ b/base/lock_impl.h
@@ -48,6 +48,13 @@ class LockImpl {
  private:
   OSLockType os_lock_;
 
+#if !defined(NDEBUG) && defined(OS_WIN)
+  // All private data is implicitly protected by lock_.
+  // Be VERY careful to only access members under that lock.
+  int32 recursion_count_shadow_;
+  bool recursion_used_;      // Allow debugging to continued after a DCHECK().
+#endif  // NDEBUG
+
   DISALLOW_COPY_AND_ASSIGN(LockImpl);
 };