Initial implementation of new AssertAcquired() functionality for Posix.

Hoisted the windows LockImpl funcitonality up into Lock and added
material to ConditionVariable to adjust those shadow variables when
needed.  Also got rid of os_lock() primitive in Lock class by piggybacking
on friend decl needed for accessing shadow variables.

BUG=44091
TEST=Try bot run on Windows, Linux, Mac.  Will land during low traffic time and revert on any problems or perf degradation.

Review URL: http://codereview.chromium.org/2196001

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

1 files changed, 0 insertions, 19 deletions

diff --git a/base/lock_impl.h b/base/lock_impl.h
index 2d4a921..5e323a6 100644
--- a/base/lock_impl.h
+++ b/base/lock_impl.h
@@ -41,17 +41,6 @@ class LockImpl {
   // a successful call to Try, or a call to Lock.
   void Unlock();
 
-  // Debug-only method that will DCHECK() if the lock is not acquired by the
-  // current thread.  In non-debug builds, no check is performed.
-  // Because linux and mac condition variables modify the underlyning lock
-  // through the os_lock() method, runtime assertions can not be done on those
-  // builds.
-#if defined(NDEBUG) || !defined(OS_WIN)
-  void AssertAcquired() const {}
-#else
-  void AssertAcquired() const;
-#endif
-
   // Return the native underlying lock.  Not supported for Windows builds.
   // TODO(awalker): refactor lock and condition variables so that this is
   // unnecessary.
@@ -62,14 +51,6 @@ 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.
-  PlatformThreadId owning_thread_id_;
-  int32 recursion_count_shadow_;
-  bool recursion_used_;      // Allow debugging to continued after a DCHECK().
-#endif  // NDEBUG
-
   DISALLOW_COPY_AND_ASSIGN(LockImpl);
 };