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

1 files changed, 4 insertions, 4 deletions

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;