diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-05-25 12:09:51 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-25 12:09:51 -0700 |
| commit | 1e0959f50e280fd2cc683ff02588f940cc8c8bb0 (patch) | |
| tree | dacf2bb19c2fa650518d91fcdf610953a4c548d3 /Source/WebKit/android/WebCoreSupport/WebCookieJar.cpp | |
| parent | a65177a6c88816d4319790c570f783ec9957fb5a (diff) | |
| parent | f5c16878840c58e6e0b1622e0cd950fe27ae7832 (diff) | |
| download | external_webkit-1e0959f50e280fd2cc683ff02588f940cc8c8bb0.zip external_webkit-1e0959f50e280fd2cc683ff02588f940cc8c8bb0.tar.gz external_webkit-1e0959f50e280fd2cc683ff02588f940cc8c8bb0.tar.bz2 | |
Merge "Merge chromium at 10.0.634.0: Compile fixes"
Diffstat (limited to 'Source/WebKit/android/WebCoreSupport/WebCookieJar.cpp')
| -rw-r--r-- | Source/WebKit/android/WebCoreSupport/WebCookieJar.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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; }; |