Merge "Merge chromium at 10.0.634.0: Compile fixes"

4 files changed, 11 insertions, 11 deletions

diff --git a/Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h b/Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h
index bea78eb..e467218 100644
--- a/Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h
+++ b/Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h
@@ -47,13 +47,13 @@
 
 #include <android/net/android_network_library_impl.h>
 #include <base/callback.h>
-#include <base/condition_variable.h>
 #include <base/lock.h>
 #include <base/message_loop_proxy.h>
 #include <base/ref_counted.h>
 #include <base/string_util.h>
+#include <base/synchronization/condition_variable.h>
 #include <base/sys_string_conversions.h>
-#include <base/thread.h>
+#include <base/threading/thread.h>
 #include <base/time.h>
 #include <base/tuple.h>
 #include <chrome/browser/net/sqlite_persistent_cookie_store.h>
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;
 };
 
diff --git a/Source/WebKit/android/WebCoreSupport/WebUrlLoaderClient.cpp b/Source/WebKit/android/WebCoreSupport/WebUrlLoaderClient.cpp
index cf218e7..b22ae26 100644
--- a/Source/WebKit/android/WebCoreSupport/WebUrlLoaderClient.cpp
+++ b/Source/WebKit/android/WebCoreSupport/WebUrlLoaderClient.cpp
@@ -69,13 +69,13 @@ base::Thread* WebUrlLoaderClient::ioThread()
     return networkThread;
 }
 
-Lock* WebUrlLoaderClient::syncLock() {
+base::Lock* WebUrlLoaderClient::syncLock() {
     static Lock s_syncLock;
     return &s_syncLock;
 }
 
-ConditionVariable* WebUrlLoaderClient::syncCondition() {
-    static ConditionVariable s_syncCondition(syncLock());
+base::ConditionVariable* WebUrlLoaderClient::syncCondition() {
+    static base::ConditionVariable s_syncCondition(syncLock());
     return &s_syncCondition;
 }
 
diff --git a/Source/WebKit/android/WebCoreSupport/WebUrlLoaderClient.h b/Source/WebKit/android/WebCoreSupport/WebUrlLoaderClient.h
index dc101db..224fa65 100644
--- a/Source/WebKit/android/WebCoreSupport/WebUrlLoaderClient.h
+++ b/Source/WebKit/android/WebCoreSupport/WebUrlLoaderClient.h
@@ -36,10 +36,10 @@
 #include <string>
 #include <vector>
 
-class Lock;
-class ConditionVariable;
 
 namespace base {
+class ConditionVariable;
+class Lock;
 class Thread;
 }
 
@@ -118,8 +118,8 @@ private:
 
     // Mutex and condition variable used for synchronous requests.
     // Note that these are static. This works because there's only one main thread.
-    static Lock* syncLock();
-    static ConditionVariable* syncCondition();
+    static base::Lock* syncLock();
+    static base::ConditionVariable* syncCondition();
 
     // Queue of callbacks to be executed by the main thread. Must only be accessed inside mutex.
     std::deque<Task*> m_queue;