From f5c16878840c58e6e0b1622e0cd950fe27ae7832 Mon Sep 17 00:00:00 2001 From: Kristian Monsen Date: Wed, 25 May 2011 12:07:14 +0100 Subject: Merge chromium at 10.0.634.0: Compile fixes base/thread.h moved to base/threading/thread.h: http://codereview.chromium.org/6028009 base/condition_variable.h base/lock.h moved to base/synchronization and classes added to base namespace: http://codereview.chromium.org/6018013 Change-Id: I74d14224d6b17df33bc1cc9a5521fd267f4e830c --- Source/WebKit/android/WebCoreSupport/WebCookieJar.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Source/WebKit/android/WebCoreSupport/WebCookieJar.cpp') diff --git a/Source/WebKit/android/WebCoreSupport/WebCookieJar.cpp b/Source/WebKit/android/WebCoreSupport/WebCookieJar.cpp index 99de67e..429e990 100644 --- a/Source/WebKit/android/WebCoreSupport/WebCookieJar.cpp +++ b/Source/WebKit/android/WebCoreSupport/WebCookieJar.cpp @@ -228,8 +228,8 @@ private: m_condition.Broadcast(); } - Lock m_lock; - ConditionVariable m_condition; + base::Lock m_lock; + base::ConditionVariable m_condition; volatile int m_count; }; -- cgit v1.1